summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* branch: don't assume the merge filter ref existscn/maint-branch-with-badCarlos Martín Nieto2012-02-271-0/+4
* am: don't infloop for an empty input fileJim Meyering2012-02-261-0/+10
* Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-181-0/+8
|\
| * diff-index: enable recursive pathspec matching in unpack_treesNguyen Thai Ngoc Duy2012-01-181-0/+8
* | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-111-1/+1
|\ \ | |/
| * Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-111-1/+1
| |\
| | * t2203: fix wrong commit commandNguyễn Thái Ngọc Duy2012-01-111-1/+1
* | | Merge the attributes fix in from maint-1.6.7 branchJunio C Hamano2012-01-101-0/+10
|\ \ \ | |/ /
| * | Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano2012-01-101-0/+10
| |\ \ | | |/
| | * attr: don't confuse prefixes with leading directoriesJeff King2012-01-101-0/+10
* | | t5550: repack everything into one fileClemens Buchacher2012-01-041-2/+1
* | | fix hang in git fetch if pointed at a 0 length bundleBrian Harring2012-01-031-0/+6
* | | Merge branch 'jc/checkout-m-twoway' into maintJunio C Hamano2011-12-281-0/+49
|\ \ \
| * | | t/t2023-checkout-m.sh: fix use of test_must_failjc/checkout-m-twowayÆvar Arnfjörð Bjarmason2011-12-201-1/+3
| * | | Test 'checkout -m -- path'Pete Harlan2011-12-111-0/+47
* | | | Merge branch 'jk/http-push-to-empty' into maintJunio C Hamano2011-12-281-0/+32
|\ \ \ \
| * | | | remote-curl: don't pass back fake refsjk/http-push-to-emptyJeff King2011-12-191-0/+32
* | | | | Merge branch 'jn/maint-sequencer-fixes' into maintJunio C Hamano2011-12-282-58/+156
|\ \ \ \ \
| * | | | | Revert "reset: Make reset remove the sequencer state"Jonathan Nieder2011-12-122-53/+1
| * | | | | revert: do not remove state until sequence is finishedJonathan Nieder2011-12-121-3/+3
| * | | | | revert: allow single-pick in the middle of cherry-pick sequenceJonathan Nieder2011-12-121-0/+12
| * | | | | revert: pass around rev-list args in already-parsed formJonathan Nieder2011-12-121-0/+5
| * | | | | revert: allow cherry-pick --continue to commit before resumingJonathan Nieder2011-12-121-3/+136
| |/ / / /
* | | | | Merge branch 'jk/maint-push-over-dav' into maintJunio C Hamano2011-12-282-0/+37
|\ \ \ \ \
| * | | | | http-push: enable "proactive auth"jk/maint-push-over-davJeff King2011-12-131-1/+1
| * | | | | t5540: test DAV push with authenticationJeff King2011-12-132-0/+37
| |/ / / /
* | | | | Merge branch 'jk/fetch-no-tail-match-refs' into maintJunio C Hamano2011-12-282-3/+32
|\ \ \ \ \
| * | | | | fetch-pack: match refs exactlyJeff King2011-12-131-0/+29
| * | | | | t5500: give fully-qualified refs to fetch-packJeff King2011-12-131-3/+3
| |/ / / /
* | | | | Merge branch 'jh/fast-import-notes' into maintJunio C Hamano2011-12-281-5/+58
|\ \ \ \ \
| * | | | | fast-import: Fix incorrect fanout level when modifying existing notes refsjh/fast-import-notesJohan Herland2011-11-281-4/+4
| * | | | | t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handlingJohan Herland2011-11-281-0/+54
| * | | | | t9301: Fix testcase covering up a bug in fast-import's notes fanout handlingJohan Herland2011-11-281-7/+6
| |/ / / /
* | | | | Merge branch 'jn/branch-move-to-self' into maintJunio C Hamano2011-12-282-4/+21
|\ \ \ \ \
| * | | | | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-selfJonathan Nieder2011-11-281-4/+5
| * | | | | branch: allow a no-op "branch -M <current-branch> HEAD"Jonathan Nieder2011-11-281-0/+16
* | | | | | Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano2011-12-212-1/+20
|\ \ \ \ \ \
| * | | | | | builtin/apply.c: report error on failure to recognize inputbc/maint-apply-check-no-patchBrandon Casey2011-12-051-0/+19
| * | | | | | t/t4131-apply-fake-ancestor.sh: fix broken testBrandon Casey2011-12-051-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jk/maint-upload-archive' into maintJunio C Hamano2011-12-211-0/+8
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archiveJunio C Hamano2011-11-211-0/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | archive: don't let remote clients get unreachable commitsjk/maint-1.6.2-upload-archiveJeff King2011-11-211-0/+8
* | | | | | revert --abort: do not leave behind useless sequencer-old directoryJonathan Nieder2011-11-231-0/+8
| |_|/ / / |/| | | |
* | | | | revert: remove --reset compatibility optionjn/revert-quitJonathan Nieder2011-11-221-2/+2
* | | | | revert: introduce --abort to cancel a failed cherry-pickJonathan Nieder2011-11-221-0/+96
* | | | | revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder2011-11-221-0/+54
* | | | | revert: rename --reset option to --quitJonathan Nieder2011-11-222-6/+27
* | | | | t5501-*.sh: Fix url passed to clone in setup testRamsay Jones2011-11-201-1/+1
* | | | | refs: loosen over-strict "format" checkJunio C Hamano2011-11-161-0/+7
* | | | | Revert "upload-archive: use start_command instead of fork"Junio C Hamano2011-11-151-5/+5