summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* expand --pretty=format color optionsJeff King2009-01-171-1/+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
* | | | | | | | | Merge branch 'jc/maint-do-not-switch-to-non-commit'Junio C Hamano2009-01-031-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | git checkout: do not allow switching to a tree-ish that is not a commitJunio C Hamano2009-01-031-0/+4
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'ap/maint-apply-modefix'Junio C Hamano2009-01-031-0/+62
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | builtin-apply: prevent non-explicit permission changesJunio C Hamano2009-01-021-0/+62
* | | | | | | | Merge branch 'np/auto-thread'Junio C Hamano2008-12-291-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Force t5302 to use a single threadJohannes Schindelin2008-12-151-0/+1
* | | | | | | | Merge branch 'sp/maint-describe-all-tag-warning' into maintJunio C Hamano2008-12-271-0/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | describe: Avoid unnecessary warning when using --allShawn O. Pearce2008-12-261-0/+6
* | | | | | | | Merge branch 'js/rebase-i-p'Junio C Hamano2008-12-241-11/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin2008-12-241-0/+1
| * | | | | | | | rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt2008-12-211-1/+1
| * | | | | | | | Show a failure of rebase -p if the merge had a conflictJohannes Sixt2008-12-211-11/+44
* | | | | | | | | t9129: skip the last three tests if UTF-8 locale is not availableMiklos Vajna2008-12-221-13/+17
View Lorry Controller Status