Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/maint-add-p-empty' into maint | Junio C Hamano | 2009-11-16 | 1 | -0/+17 |
|\ | |||||
| * | add-interactive: handle deletion of empty files | Jeff King | 2009-10-27 | 1 | -0/+17 |
* | | Merge branch 'js/maint-diff-color-words' into maint | Junio C Hamano | 2009-11-16 | 1 | -0/+20 |
|\ \ | |||||
| * | | diff --color-words -U0: fix the location of hunk headers | Johannes Schindelin | 2009-10-30 | 1 | -1/+1 |
| * | | t4034-diff-words: add a test for word diff without context | Markus Heidelberg | 2009-10-30 | 1 | -0/+20 |
| |/ | |||||
* | | Merge branch 'jk/maint-format-patch-p-suppress-stat' into maint | Junio C Hamano | 2009-11-15 | 1 | -0/+21 |
|\ \ | |||||
| * | | format-patch: make "-p" suppress diffstat | Jeff King | 2009-11-08 | 1 | -0/+21 |
| |/ | |||||
* | | Merge branch 'jk/maint-1.6.3-ls-files-i' into maint | Junio C Hamano | 2009-11-15 | 1 | -0/+8 |
|\ \ | |||||
| * | | ls-files: unbreak "ls-files -i" | Jeff King | 2009-10-30 | 1 | -0/+8 |
* | | | Merge branch 'jc/maint-blank-at-eof' into maint | Junio C Hamano | 2009-11-15 | 3 | -3/+110 |
|\ \ \ | |||||
| * \ \ | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a... | Junio C Hamano | 2009-09-15 | 3 | -3/+110 |
| |\ \ \ | |||||
| | * | | | diff --whitespace: fix blank lines at end | Junio C Hamano | 2009-09-14 | 1 | -1/+1 |
| | * | | | diff --color: color blank-at-eof | Junio C Hamano | 2009-09-04 | 1 | -0/+9 |
| | * | | | diff --whitespace=warn/error: fix blank-at-eof check | Junio C Hamano | 2009-09-04 | 1 | -0/+7 |
| | * | | | diff --whitespace=warn/error: obey blank-at-eof | Junio C Hamano | 2009-09-04 | 2 | -3/+3 |
| | * | | | apply --whitespace: warn blank but not necessarily empty lines at EOF | Junio C Hamano | 2009-09-04 | 1 | -0/+13 |
| | * | | | apply --whitespace=warn/error: diagnose blank at EOF | Junio C Hamano | 2009-09-04 | 1 | -0/+26 |
| | * | | | apply --whitespace=fix: detect new blank lines at eof correctly | Junio C Hamano | 2009-09-04 | 1 | -0/+24 |
| | * | | | apply --whitespace=fix: fix handling of blank lines at the eof | Junio C Hamano | 2009-09-04 | 1 | -0/+29 |
| | * | | | Merge branch 'maint-1.5.6' into maint-1.6.0 | Junio C Hamano | 2009-08-27 | 1 | -0/+39 |
| | |\ \ \ | |||||
* | | \ \ \ | Merge branch 'maint-1.6.4' into maint | Junio C Hamano | 2009-10-25 | 1 | -0/+32 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4 | Junio C Hamano | 2009-10-25 | 1 | -0/+32 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | ls-files: excludes should not impact tracked files | Jeff King | 2009-10-12 | 1 | -0/+32 |
* | | | | | | | t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test | Markus Heidelberg | 2009-10-24 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jp/maint-send-email-fold' into maint | Junio C Hamano | 2009-10-23 | 1 | -20/+74 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT... | Joe Perches | 2009-10-09 | 1 | -20/+74 |
* | | | | | | | | Merge branch 'pv/maint-add-p-no-exclude' into maint | Junio C Hamano | 2009-10-23 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-add--interactive: never skip files included in index | Pauli Virtanen | 2009-10-10 | 1 | -0/+14 |
| |/ / / / / / / | |||||
* | | | | | | | | Do not fail "describe --always" in a tag-less repository | Junio C Hamano | 2009-10-23 | 1 | -0/+2 |
* | | | | | | | | Mark files in t/t5100 as UTF-8 | Johannes Sixt | 2009-10-21 | 1 | -0/+4 |
* | | | | | | | | Remove a left-over file from t/t5100 | Johannes Sixt | 2009-10-21 | 1 | -35/+0 |
* | | | | | | | | Merge branch 'maint-1.6.4' into maint | Junio C Hamano | 2009-10-16 | 1 | -0/+66 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | grep: do not segfault when -f is used | Matt Kraai | 2009-10-16 | 1 | -0/+66 |
| |/ / / / / / | |||||
* | | | | | | | sha1_file: Fix infinite loop when pack is corrupted | Shawn O. Pearce | 2009-10-14 | 1 | -0/+9 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge branch 'rs/maint-archive-prefix' | Junio C Hamano | 2009-10-09 | 1 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Git archive and trailing "/" in prefix | René Scharfe | 2009-10-08 | 1 | -0/+12 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-10-04 | 1 | -0/+8 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'jc/maint-1.6.4-show-branch-default' into maint | Junio C Hamano | 2009-10-04 | 1 | -0/+8 |
| |\ \ \ \ \ | |||||
| | * | | | | | show-branch: fix segfault when showbranch.default exists | Junio C Hamano | 2009-10-04 | 1 | -0/+8 |
| * | | | | | | Merge branch 'jc/maint-unpack-objects-strict' into maint | Junio C Hamano | 2009-09-16 | 1 | -0/+35 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/maint-1.6.3-checkout-unborn' into maint | Junio C Hamano | 2009-09-16 | 1 | -0/+40 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/maint-checkout-index-to-prefix' into maint | Junio C Hamano | 2009-09-16 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Fix '--relative-date' | Johan Sageryd | 2009-10-03 | 1 | -0/+1 |
* | | | | | | | | | tests: make all test files executable | Mark Rada | 2009-10-02 | 2 | -0/+0 |
* | | | | | | | | | parse-opt: ignore negation of OPT_NONEG for ambiguity checks | Andreas Schwab | 2009-09-29 | 1 | -0/+20 |
* | | | | | | | | | test local clone by copying | Clemens Buchacher | 2009-09-13 | 1 | -21/+33 |
* | | | | | | | | | Merge branch 'jt/pushinsteadof' | Junio C Hamano | 2009-09-13 | 1 | -0/+47 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add url.<base>.pushInsteadOf: URL rewriting for push only | Josh Triplett | 2009-09-08 | 1 | -0/+47 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-09-13 | 2 | -0/+31 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | svn: properly escape arguments for authors-prog | Mark Lodato | 2009-09-13 | 1 | -0/+14 |