aboutsummaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
Commit message (Expand)AuthorAge
* 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