aboutsummaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
Commit message (Expand)AuthorAge
* revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder2011-11-22
* revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-06
* i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507Junio C Hamano2011-04-13
* Merge branch 'ab/i18n-st'Junio C Hamano2011-04-01
|\
| * i18n: git-revert split up "could not revert/apply" messageÆvar Arnfjörð Bjarmason2011-03-09
* | Teach commit about CHERRY_PICK_HEADJay Soffian2011-02-21
* | Introduce CHERRY_PICK_HEADJay Soffian2011-02-21
* | t3507: introduce pristine-detach helperJonathan Nieder2011-02-21
|/
* tests: fix syntax error in "Use advise() for hints" testÆvar Arnfjörð Bjarmason2010-08-18
* cherry-pick/revert: Use advise() for hintsJonathan Nieder2010-08-15
* t3507: Make test executableStephen Boyd2010-04-11
* cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-20
* revert: clarify label on conflict hunksJonathan Nieder2010-03-20
* tests: document cherry-pick behavior in face of conflictsJonathan Nieder2010-03-20