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