summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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-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-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-recursive: mark rename/delete conflict as unmergedJohannes Schindelin2008-12-241-0/+23
* | | Merge branch 'cb/maint-merge-recursive-fix' into maintJunio C Hamano2009-01-131-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 'ap/maint-apply-modefix' into maintJunio C Hamano2009-01-131-0/+62
|\ \ \ \
| * | | | builtin-apply: prevent non-explicit permission changesJunio C Hamano2009-01-021-0/+62
* | | | | Merge branch 'jc/maint-do-not-switch-to-non-commit' into maintJunio C Hamano2009-01-111-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 '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
* | | | | | Make sure lockfiles are unlocked when dying on SIGPIPEJunio C Hamano2008-12-211-0/+17
* | | | | | git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dirMarcel M. Cary2008-12-212-0/+115
|/ / / / /
* | | | | Merge branch 'maint' to sync with GIT 1.6.0.6Junio C Hamano2008-12-192-0/+38
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | fast-import: make tagger information optionalJunio C Hamano2008-12-191-0/+18
| * | | | fast-export: deal with tag objects that do not have a taggerJohannes Schindelin2008-12-191-0/+20
* | | | | test overlapping ignore patternsMichael J Gruber2008-12-181-0/+6
* | | | | Merge branch 'maint'Junio C Hamano2008-12-151-0/+20
|\ \ \ \ \ | |/ / / /
| * | | | git-show: do not segfault when showing a bad tagJunio C Hamano2008-12-151-0/+20
| | |_|/ | |/| |
* | | | Get rid of the last remnants of GIT_CONFIG_LOCALv1.6.1-rc3Johannes Schindelin2008-12-142-2/+1
* | | | git-branch: display sha1 on branch deletionBrandon Casey2008-12-121-1/+2
* | | | Fix t4031Junio C Hamano2008-12-101-1/+1
* | | | Merge branch 'maint'Junio C Hamano2008-12-091-0/+42
|\ \ \ \ | |/ / /
| * | | git-svn: Make following parents atomicDeskin Miller2008-12-081-0/+42
| * | | "git diff <tree>{3,}": do not reverse order of argumentsMatt McCutchen2008-12-072-0/+30
| * | | Merge branch 'jk/maint-commit-v-strip' into maintJunio C Hamano2008-12-021-0/+73
| |\ \ \
| * \ \ \ Merge branch 'bc/maint-keep-pack' into maintJunio C Hamano2008-12-022-3/+88
| |\ \ \ \
| * \ \ \ \ Merge branch 'st/maint-tag' into maintJunio C Hamano2008-11-301-0/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mk/maint-cg-push' into maintJunio C Hamano2008-11-301-0/+50
| |\ \ \ \ \ \
* | | | | | | | diff: respect textconv in rewrite diffsJeff King2008-12-091-1/+23
* | | | | | | | diff: fix handling of binary rewrite diffsJeff King2008-12-091-0/+45
* | | | | | | | gitweb: Fix bug in insert_file() subroutineJakub Narebski2008-12-081-0/+10
* | | | | | | | git-am: rename apply_opt_extra file to apply-optJunio C Hamano2008-12-051-1/+0
* | | | | | | | Test that git-am does not lose -C/-p/--whitespace optionsJunio C Hamano2008-12-0411-0/+229
* | | | | | | | Merge branch 'dm/svn-remote'Junio C Hamano2008-12-031-0/+19
|\ \ \ \ \ \ \ \
View Lorry Controller Status