Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | tests: fix "export var=val" | Junio C Hamano | 2009-02-18 | 2 | -3/+3 |
* | Skip timestamp differences for diff --no-index | Michael Spang | 2009-02-18 | 2 | -0/+7 |
* | Merge branch 'maint-1.5.6' into maint | Junio C Hamano | 2009-02-11 | 1 | -0/+39 |
|\ | |||||
| * | Merge branch 'maint-1.5.5' into maint-1.5.6 | Junio C Hamano | 2009-02-11 | 1 | -0/+39 |
| |\ | |||||
| | * | Merge branch 'maint-1.5.4' into maint-1.5.5 | Junio C Hamano | 2009-02-11 | 1 | -0/+39 |
| | |\ | |||||
| | | * | revision traversal and pack: notice and die on missing commit | Junio C Hamano | 2009-02-11 | 1 | -0/+39 |
* | | | | Merge branch 'sg/maint-gitdir-in-subdir' into maint | Junio C Hamano | 2009-02-05 | 1 | -0/+7 |
|\ \ \ \ | |||||
| * | | | | Fix gitdir detection when in subdir of gitdir | SZEDER Gábor | 2009-01-17 | 1 | -0/+7 |
* | | | | | Merge branch 'jc/maint-split-diff-metainfo' into maint | Junio C Hamano | 2009-02-05 | 2 | -1/+19 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me... | Junio C Hamano | 2009-01-27 | 2 | -1/+19 |
| |\ \ \ \ \ | |||||
| | * | | | | | diff.c: output correct index lines for a split diff | Junio C Hamano | 2009-01-27 | 1 | -0/+18 |
| | |/ / / / | |||||
* | | | | | | Merge branch 'js/maint-all-implies-HEAD' into maint | Junio C Hamano | 2009-02-05 | 2 | -2/+40 |
|\ \ \ \ \ \ | |||||
| * | | | | | | bundle: allow the same ref to be given more than once | Junio C Hamano | 2009-01-17 | 1 | -1/+1 |
| * | | | | | | revision walker: include a detached HEAD in --all | Johannes Schindelin | 2009-01-17 | 2 | -2/+40 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'kc/maint-diff-bwi-fix' into maint | Junio C Hamano | 2009-02-05 | 1 | -0/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix combined use of whitespace ignore options to diff | Keith Cascio | 2009-01-19 | 1 | -4/+4 |
| * | | | | | | test more combinations of ignore-whitespace options to diff | Keith Cascio | 2009-01-19 | 1 | -0/+27 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-02-04 | 1 | -1/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin-mv.c: check for unversionned files before looking at the destination. | Matthieu Moy | 2009-02-04 | 1 | -1/+1 |
| * | | | | | | Add a testcase for "git mv -f" on untracked files. | Matthieu Moy | 2009-02-04 | 1 | -0/+8 |
| * | | | | | | Missing && in t/t7001.sh. | Matthieu Moy | 2009-02-04 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jc/maint-format-patch-o-relative' into maint | Junio C Hamano | 2009-01-28 | 1 | -1/+51 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Teach format-patch to handle output directory relative to cwd | Junio C Hamano | 2009-01-12 | 1 | -1/+51 |
* | | | | | | | Merge branch 'nd/grep-assume-unchanged' into maint | Junio C Hamano | 2009-01-28 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | grep: grep cache entries if they are "assume unchanged" | Nguyễn Thái Ngọc Duy | 2008-12-27 | 1 | -0/+7 |
* | | | | | | | | Merge branch 'mc/cd-p-pwd' into maint | Junio C Hamano | 2009-01-28 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X | Marcel M. Cary | 2009-01-05 | 1 | -2/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | send-pack: do not send unknown object name from ".have" to pack-objects | Junio C Hamano | 2009-01-27 | 1 | -0/+106 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'cb/maint-unpack-trees-absense' into maint | Junio C Hamano | 2009-01-23 | 1 | -0/+51 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | unpack-trees: fix path search bug in verify_absent | Clemens Buchacher | 2009-01-05 | 1 | -0/+27 |
| * | | | | | | | unpack-trees: handle failure in verify_absent | Clemens Buchacher | 2009-01-05 | 1 | -0/+24 |
* | | | | | | | | Merge branch 'tr/maint-no-index-fixes' into maint | Junio C Hamano | 2009-01-23 | 2 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff: accept -- when using --no-index | Thomas Rast | 2009-01-06 | 2 | -0/+4 |
* | | | | | | | | | Merge branch 'js/add-not-submodule' into maint | Junio C Hamano | 2009-01-23 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git add: do not add files from a submodule | Johannes Schindelin | 2009-01-05 | 1 | -0/+25 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Rename diff.suppress-blank-empty to diff.suppressBlankEmpty | Johannes Schindelin | 2009-01-21 | 1 | -4/+4 |
* | | | | | | | | | t5540: clarify that http-push does not handle packed-refs on the remote | Johannes Schindelin | 2009-01-17 | 1 | -3/+15 |
* | | | | | | | | | http-push: when making directories, have a trailing slash in the path name | Johannes Schindelin | 2009-01-17 | 2 | -0/+8 |
* | | | | | | | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-01-15 | 2 | -0/+34 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | t3404: Add test case for auto-amending only edited commits after "edit" | Stephan Beyer | 2009-01-15 | 1 | -0/+17 |
| * | | | | | | | | t3404: Add test case for aborted --continue after "edit" | Stephan Beyer | 2009-01-15 | 1 | -0/+15 |
| * | | | | | | | | t3501: check that commits are actually done | Stephan Beyer | 2009-01-15 | 1 | -0/+2 |
* | | | | | | | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-01-14 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | fix handling of multiple untracked files for git mv -k | Michael J Gruber | 2009-01-14 | 1 | -1/+1 |
| * | | | | | | | | add test cases for "git mv -k" | Michael J Gruber | 2009-01-14 | 1 | -0/+25 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Make t3411 executable | Miklos Vajna | 2009-01-14 | 1 | -0/+0 |
* | | | | | | | | Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint | Junio C Hamano | 2009-01-13 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge-recursive: mark rename/delete conflict as unmerged | Johannes Schindelin | 2008-12-24 | 1 | -0/+23 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'cb/maint-merge-recursive-fix' into maint | Junio C Hamano | 2009-01-13 | 1 | -0/+87 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge-recursive: do not clobber untracked working tree garbage | Junio C Hamano | 2008-12-15 | 1 | -1/+1 |