summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
AgeCommit message (Expand)Author
2011-10-06revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian
2011-04-13i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507Junio C Hamano
2011-04-02Merge branch 'ab/i18n-st'Junio C Hamano
2011-03-10i18n: git-revert split up "could not revert/apply" messageÆvar Arnfjörð Bjarmason
2011-02-22Teach commit about CHERRY_PICK_HEADJay Soffian
2011-02-22Introduce CHERRY_PICK_HEADJay Soffian
2011-02-22t3507: introduce pristine-detach helperJonathan Nieder
2010-08-18tests: fix syntax error in "Use advise() for hints" testÆvar Arnfjörð Bjarmason
2010-08-16cherry-pick/revert: Use advise() for hintsJonathan Nieder
2010-04-11t3507: Make test executableStephen Boyd
2010-03-21cherry-pick, revert: add a label for ancestorJonathan Nieder
2010-03-21revert: clarify label on conflict hunksJonathan Nieder
2010-03-21tests: document cherry-pick behavior in face of conflictsJonathan Nieder