summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
Commit message (Expand)AuthorAgeFilesLines
* cherry-pick: No advice to commit if --no-commitph/cherry-pick-advice-refinementPhil Hord2012-02-221-0/+14
* revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder2011-11-221-0/+54
* revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-061-0/+15
* i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507Junio C Hamano2011-04-131-2/+2
* Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-1/+1
|\
| * i18n: git-revert split up "could not revert/apply" messageÆvar Arnfjörð Bjarmason2011-03-091-1/+1
* | Teach commit about CHERRY_PICK_HEADJay Soffian2011-02-211-1/+1
* | Introduce CHERRY_PICK_HEADJay Soffian2011-02-211-1/+75
* | t3507: introduce pristine-detach helperJonathan Nieder2011-02-211-54/+22
|/
* tests: fix syntax error in "Use advise() for hints" testÆvar Arnfjörð Bjarmason2010-08-181-5/+5
* cherry-pick/revert: Use advise() for hintsJonathan Nieder2010-08-151-0/+20
* t3507: Make test executableStephen Boyd2010-04-111-0/+0
* cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-201-2/+2
* revert: clarify label on conflict hunksJonathan Nieder2010-03-201-2/+2
* tests: document cherry-pick behavior in face of conflictsJonathan Nieder2010-03-201-0/+198