summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2009-01-13Merge branch 'js/maint-merge-recursive-r-d-conflict' into maintLibravatar Junio C Hamano1-0/+23
2009-01-13Merge branch 'cb/maint-merge-recursive-fix' into maintLibravatar Junio C Hamano1-0/+87
2009-01-13Merge branch 'ap/maint-apply-modefix' into maintLibravatar Junio C Hamano1-0/+62
2009-01-11Merge branch 'jc/maint-do-not-switch-to-non-commit' into maintLibravatar Junio C Hamano1-0/+4
2009-01-03git checkout: do not allow switching to a tree-ish that is not a commitLibravatar Junio C Hamano1-0/+4
2009-01-02builtin-apply: prevent non-explicit permission changesLibravatar Junio C Hamano1-0/+62
2008-12-27Merge branch 'sp/maint-describe-all-tag-warning' into maintLibravatar Junio C Hamano1-0/+6
2008-12-26describe: Avoid unnecessary warning when using --allLibravatar Shawn O. Pearce1-0/+6
2008-12-24merge-recursive: mark rename/delete conflict as unmergedLibravatar Johannes Schindelin1-0/+23
2008-12-24Merge branch 'js/rebase-i-p'Libravatar Junio C Hamano1-11/+45
2008-12-24rebase -i -p: leave a --cc patch when a merge could not be redoneLibravatar Johannes Schindelin1-0/+1
2008-12-22t9129: skip the last three tests if UTF-8 locale is not availableLibravatar Miklos Vajna1-13/+17
2008-12-21Make sure lockfiles are unlocked when dying on SIGPIPELibravatar Junio C Hamano1-0/+17
2008-12-21git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dirLibravatar Marcel M. Cary2-0/+115
2008-12-21rebase -i -p: Fix --continue after a merge could not be redoneLibravatar Johannes Sixt1-1/+1
2008-12-21Show a failure of rebase -p if the merge had a conflictLibravatar Johannes Sixt1-11/+44
2008-12-19Merge branch 'maint' to sync with GIT 1.6.0.6Libravatar Junio C Hamano2-0/+38
2008-12-19fast-import: make tagger information optionalLibravatar Junio C Hamano1-0/+18
2008-12-19fast-export: deal with tag objects that do not have a taggerLibravatar Johannes Schindelin1-0/+20
2008-12-18test overlapping ignore patternsLibravatar Michael J Gruber1-0/+6
2008-12-15Merge branch 'maint'Libravatar Junio C Hamano1-0/+20
2008-12-15merge-recursive: do not clobber untracked working tree garbageLibravatar Junio C Hamano1-1/+1
2008-12-15modify/delete conflict resolution overwrites untracked fileLibravatar Clemens Buchacher1-0/+87
2008-12-15git-show: do not segfault when showing a bad tagLibravatar Junio C Hamano1-0/+20
2008-12-14Get rid of the last remnants of GIT_CONFIG_LOCALLibravatar Johannes Schindelin2-2/+1
2008-12-12git-branch: display sha1 on branch deletionLibravatar Brandon Casey1-1/+2
2008-12-10Fix t4031Libravatar Junio C Hamano1-1/+1
2008-12-09Merge branch 'maint'Libravatar Junio C Hamano1-0/+42
2008-12-09diff: respect textconv in rewrite diffsLibravatar Jeff King1-1/+23
2008-12-09diff: fix handling of binary rewrite diffsLibravatar Jeff King1-0/+45
2008-12-08git-svn: Make following parents atomicLibravatar Deskin Miller1-0/+42
2008-12-08gitweb: Fix bug in insert_file() subroutineLibravatar Jakub Narebski1-0/+10
2008-12-07"git diff <tree>{3,}": do not reverse order of argumentsLibravatar Matt McCutchen2-0/+30
2008-12-05git-am: rename apply_opt_extra file to apply-optLibravatar Junio C Hamano1-1/+0
2008-12-04Test that git-am does not lose -C/-p/--whitespace optionsLibravatar Junio C Hamano11-0/+229
2008-12-03Merge branch 'dm/svn-remote'Libravatar Junio C Hamano1-0/+19
2008-12-03git-svn: Make branch use correct svn-remoteLibravatar Deskin Miller1-0/+19
2008-12-03Merge branch 'jc/rm-i-t-a'Libravatar Junio C Hamano2-2/+30
2008-12-02Merge branch 'jk/maint-commit-v-strip' into maintLibravatar Junio C Hamano1-0/+73
2008-12-02Merge branch 'bc/maint-keep-pack' into maintLibravatar Junio C Hamano2-3/+88
2008-12-02t4030-diff-textconv: Make octal escape sequence more portableLibravatar Johannes Sixt1-1/+1
2008-12-02bisect: fix "git bisect skip <commit>" and add tests casesLibravatar Christian Couder1-1/+18
2008-11-30send-email: do not reverse the command line argumentsLibravatar Junio C Hamano1-0/+13
2008-11-30Merge branch 'st/maint-tag' into maintLibravatar Junio C Hamano1-0/+11
2008-11-30Merge branch 'mk/maint-cg-push' into maintLibravatar Junio C Hamano1-0/+50
2008-11-30git add --intent-to-add: do not let an empty blob be committed by accidentLibravatar Junio C Hamano1-0/+28
2008-11-28git add --intent-to-add: fix removal of cached emptinessLibravatar Junio C Hamano1-2/+2
2008-11-27Merge branch 'ta/quiet-pull'Libravatar Junio C Hamano1-0/+60
2008-11-27Merge branch 'ph/send-email'Libravatar Junio C Hamano1-0/+8
2008-11-27Merge branch 'maint'Libravatar Junio C Hamano1-0/+8