summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \
| * | | | | | git-svn: Make branch use correct svn-remoteDeskin Miller2008-12-031-0/+19
* | | | | | | Merge branch 'jc/rm-i-t-a'Junio C Hamano2008-12-032-2/+30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | git add --intent-to-add: do not let an empty blob be committed by accidentJunio C Hamano2008-11-301-0/+28
| * | | | | | git add --intent-to-add: fix removal of cached emptinessJunio C Hamano2008-11-281-2/+2
* | | | | | | t4030-diff-textconv: Make octal escape sequence more portableJohannes Sixt2008-12-021-1/+1
* | | | | | | bisect: fix "git bisect skip <commit>" and add tests casesChristian Couder2008-12-021-1/+18
* | | | | | | send-email: do not reverse the command line argumentsJunio C Hamano2008-11-301-0/+13
|/ / / / / /
* | | | | | Merge branch 'ta/quiet-pull'Junio C Hamano2008-11-271-0/+60
|\ \ \ \ \ \
| * | | | | | Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz2008-11-141-0/+60
* | | | | | | Merge branch 'ph/send-email'Junio C Hamano2008-11-271-0/+8
|\ \ \ \ \ \ \
| * | | | | | | git send-email: interpret unknown files as revision listsPierre Habouzit2008-11-111-0/+8
* | | | | | | | Merge branch 'maint'Junio C Hamano2008-11-271-0/+8
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'mv/fast-export' into maintJunio C Hamano2008-11-271-0/+8
| |\ \ \ \ \ \ \
| | * | | | | | | fast-export: use an unsorted string list for extra_refsJohannes Schindelin2008-11-231-1/+1
| | * | | | | | | Add new testcase to show fast-export does not always exports all tagsMiklos Vajna2008-11-231-0/+8
* | | | | | | | | Merge branch 'maint'Junio C Hamano2008-11-261-0/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Teach "git diff" to honour --[no-]ext-diffJunio C Hamano2008-11-261-0/+21
| |/ / / / / / /
* | | | | | | | t9129-git-svn-i18n-commitencoding: Make compare_svn_head_with() compatible wi...Marcel Koeppen2008-11-261-1/+1
* | | | | | | | Fix t4030-diff-textconv.shAlex Riesen2008-11-231-1/+1
* | | | | | | | Merge branch 'bc/maint-keep-pack'Junio C Hamano2008-11-161-3/+15
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | repack: only unpack-unreachable if we are deleting redundant packsBrandon Casey2008-11-141-3/+15