summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* t7700: demonstrate misbehavior of 'repack -a' when local packs existBrandon Casey2009-01-171-0/+19
* test more combinations of ignore-whitespace options to diffKeith Cascio2009-01-171-0/+27
* Merge branch 'mv/apply-parse-opt'Junio C Hamano2009-01-171-0/+26
|\
| * Resurrect "git apply --flags -" to read from the standard inputJunio C Hamano2009-01-091-0/+26
* | Merge branch 'tr/rebase-root'Junio C Hamano2009-01-171-0/+187
|\ \
| * | rebase -i: learn to rebase root commitThomas Rast2009-01-111-0/+101
| * | rebase: learn to rebase root commitThomas Rast2009-01-111-0/+86
* | | Merge branch 'ap/clone-into-empty'Junio C Hamano2009-01-171-0/+19
|\ \ \
| * | | Allow cloning to an existing empty directoryAlexander Potashev2009-01-111-0/+19
* | | | Merge branch 'tr/maint-no-index-fixes'Junio C Hamano2009-01-172-0/+4
|\ \ \ \
| * | | | diff: accept -- when using --no-indexThomas Rast2009-01-062-0/+4
* | | | | Merge branch 'maint'Junio C Hamano2009-01-172-3/+23
|\ \ \ \ \
| * | | | | t5540: clarify that http-push does not handle packed-refs on the remoteJohannes Schindelin2009-01-171-3/+15
| * | | | | http-push: when making directories, have a trailing slash in the path nameJohannes Schindelin2009-01-172-0/+8
* | | | | | Merge branch 'maint'Junio C Hamano2009-01-152-0/+34
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-152-0/+34
| |\ \ \ \ \
| | * | | | | t3404: Add test case for auto-amending only edited commits after "edit"Stephan Beyer2009-01-151-0/+17
| | * | | | | t3404: Add test case for aborted --continue after "edit"Stephan Beyer2009-01-151-0/+15
| | * | | | | t3501: check that commits are actually doneStephan Beyer2009-01-151-0/+2
* | | | | | | Merge branch 'maint'Junio C Hamano2009-01-142-0/+25
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-141-0/+25
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | fix handling of multiple untracked files for git mv -kMichael J Gruber2009-01-141-1/+1
| | * | | | | add test cases for "git mv -k"Michael J Gruber2009-01-141-0/+25
| * | | | | | Make t3411 executableMiklos Vajna2009-01-141-0/+0
| * | | | | | Merge branch 'js/maint-merge-recursive-r-d-conflict' into maintJunio C Hamano2009-01-131-0/+23
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cb/maint-merge-recursive-fix' into maintJunio C Hamano2009-01-131-0/+87
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ap/maint-apply-modefix' into maintJunio C Hamano2009-01-131-0/+62
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-do-not-switch-to-non-commit' into maintJunio C Hamano2009-01-111-0/+4
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'nd/grep-assume-unchanged'Junio C Hamano2009-01-131-0/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | grep: grep cache entries if they are "assume unchanged"Nguyễn Thái Ngọc Duy2008-12-271-0/+7
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'js/bundle-tags'Junio C Hamano2009-01-131-0/+33
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bundle: allow rev-list options to exclude annotated tagsJohannes Schindelin2009-01-051-0/+33
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'js/add-not-submodule'Junio C Hamano2009-01-131-0/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git add: do not add files from a submoduleJohannes Schindelin2009-01-051-0/+25
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'cb/maint-unpack-trees-absense'Junio C Hamano2009-01-131-0/+51
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | unpack-trees: fix path search bug in verify_absentClemens Buchacher2009-01-051-0/+27
| * | | | | | | | | | | unpack-trees: handle failure in verify_absentClemens Buchacher2009-01-051-0/+24
* | | | | | | | | | | | Merge branch 'mc/cd-p-pwd'Junio C Hamano2009-01-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS XMarcel M. Cary2009-01-051-2/+2
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | git-svn: add --authors-file testEric Wong2009-01-111-0/+94
* | | | | | | | | | | | t7501-commit.sh: explicitly check that -F prevents invoking the editorAdeodato Simó2009-01-102-4/+21
* | | | | | | | | | | | filter-branch: add git_commit_non_empty_tree and --prune-empty.Pierre Habouzit2009-01-101-0/+8
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'rs/diff-ihc'Junio C Hamano2009-01-071-0/+92
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff: add option to show context between close hunksRené Scharfe2008-12-291-0/+92
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'js/maint-merge-recursive-r-d-conflict'Junio C Hamano2009-01-071-0/+23
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin2008-12-241-0/+23
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cb/merge-recursive-fix'Junio C Hamano2009-01-071-0/+87
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fixJunio C Hamano2008-12-151-0/+87
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | merge-recursive: do not clobber untracked working tree garbageJunio C Hamano2008-12-151-1/+1
| | * | | | | | | | | modify/delete conflict resolution overwrites untracked fileClemens Buchacher2008-12-151-0/+87