Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | approxidate_careful() reports errorneous date string | Junio C Hamano | 2010-01-26 | 1 | -0/+45 |
* | Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5 | Junio C Hamano | 2010-01-20 | 1 | -0/+6 |
|\ | |||||
| * | reset: unbreak hard resets with GIT_WORK_TREE | Jeff King | 2009-12-30 | 1 | -0/+6 |
* | | Merge branch 'maint-1.6.4' into maint-1.6.5 | Junio C Hamano | 2010-01-18 | 2 | -20/+20 |
|\ \ | |||||
| * \ | Merge branch 'maint-1.6.3' into maint-1.6.4 | Junio C Hamano | 2010-01-18 | 2 | -20/+20 |
| |\ \ | |||||
| | * \ | Merge branch 'maint-1.6.2' into maint-1.6.3 | Junio C Hamano | 2010-01-18 | 2 | -20/+20 |
| | |\ \ | |||||
| | | * \ | Merge branch 'maint-1.6.1' into maint-1.6.2 | Junio C Hamano | 2010-01-10 | 2 | -20/+20 |
| | | |\ \ | |||||
| | | | * \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2010-01-10 | 1 | -13/+13 |
| | | | |\ \ | |||||
| | | | | * | | branch: die explicitly why when calling "git branch [-a|-r] branchname". | Matthieu Moy | 2009-12-31 | 1 | -13/+13 |
| | | | * | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-12-29 | 1 | -7/+7 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | | * | | t7102: make the test fail if one of its check fails | Nguyễn Thái Ngọc Duy | 2009-12-29 | 1 | -7/+7 |
| * | | | | | | Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4 | Junio C Hamano | 2010-01-18 | 1 | -1/+5 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix mis-backport of t7002 | Junio C Hamano | 2010-01-18 | 1 | -1/+5 |
* | | | | | | | | Prevent git blame from segfaulting on a missing author name | David Reiss | 2009-12-22 | 1 | -0/+13 |
* | | | | | | | | worktree: don't segfault with an absolute pathspec without a work tree | Junio C Hamano | 2009-12-16 | 1 | -0/+15 |
* | | | | | | | | ignore unknown color configuration | Jeff King | 2009-12-16 | 1 | -0/+17 |
* | | | | | | | | Remove post-upload-hook | Junio C Hamano | 2009-12-10 | 1 | -69/+0 |
* | | | | | | | | Merge branch 'jk/maint-add-p-delete-fix' into maint | Junio C Hamano | 2009-12-08 | 1 | -0/+20 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | add-interactive: fix deletion of non-empty files | Jeff King | 2009-12-07 | 1 | -0/+20 |
* | | | | | | | | reset: improve worktree safety valves | Jeff King | 2009-12-05 | 1 | -3/+29 |
* | | | | | | | | Merge branch 'uk/maint-shortlog-encoding' into maint | Junio C Hamano | 2009-12-03 | 1 | -0/+28 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t4201: use ISO8859-1 rather than ISO-8859-1 | Brandon Casey | 2009-12-03 | 1 | -2/+2 |
| * | | | | | | | | shortlog: respect commit encoding | Uwe Kleine-König | 2009-11-25 | 1 | -0/+28 |
* | | | | | | | | | Merge branch 'fc/maint-format-patch-pathspec-dashes' into maint | Junio C Hamano | 2009-12-03 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | format-patch: add test for parsing of "--" | Felipe Contreras | 2009-11-26 | 1 | -0/+5 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'rj/maint-t9700' into maint | Junio C Hamano | 2009-12-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t9700-perl-git.sh: Fix a test failure on Cygwin | Ramsay Jones | 2009-11-19 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'ls/maint-mailinfo-no-inbody' into maint | Junio C Hamano | 2009-12-03 | 14 | -1/+101 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git am/mailinfo: Don't look at in-body headers when rebasing | Lukas Sandström | 2009-11-20 | 14 | -1/+101 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'pb/maint-use-custom-perl' into maint | Junio C Hamano | 2009-12-03 | 3 | -4/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Make sure $PERL_PATH is defined when the test suite is run. | Philippe Bruhat (BooK) | 2009-11-17 | 3 | -4/+4 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'bc/grep-i-F' into maint | Junio C Hamano | 2009-12-03 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | grep: Allow case insensitive search of fixed-strings | Brian Collins | 2009-11-16 | 1 | -0/+10 |
| |/ / / / / / / / | |||||
* | | | | | | | | | merge: do not add standard message when message is given with -m option | Junio C Hamano | 2009-12-02 | 1 | -5/+2 |
* | | | | | | | | | builtin-apply.c: pay attention to -p<n> when determining the name | Junio C Hamano | 2009-11-26 | 1 | -0/+17 |
* | | | | | | | | | 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 |