summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
AgeCommit message (Expand)AuthorFilesLines
2011-10-06revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soLibravatar Jay Soffian1-0/+15
2011-04-13i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507Libravatar Junio C Hamano1-2/+2
2011-04-01Merge branch 'ab/i18n-st'Libravatar Junio C Hamano1-1/+1
2011-03-09i18n: git-revert split up "could not revert/apply" messageLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-02-21Teach commit about CHERRY_PICK_HEADLibravatar Jay Soffian1-1/+1
2011-02-21Introduce CHERRY_PICK_HEADLibravatar Jay Soffian1-1/+75
2011-02-21t3507: introduce pristine-detach helperLibravatar Jonathan Nieder1-54/+22
2010-08-18tests: fix syntax error in "Use advise() for hints" testLibravatar Ævar Arnfjörð Bjarmason1-5/+5
2010-08-15cherry-pick/revert: Use advise() for hintsLibravatar Jonathan Nieder1-0/+20
2010-04-11t3507: Make test executableLibravatar Stephen Boyd1-0/+0
2010-03-20cherry-pick, revert: add a label for ancestorLibravatar Jonathan Nieder1-2/+2
2010-03-20revert: clarify label on conflict hunksLibravatar Jonathan Nieder1-2/+2
2010-03-20tests: document cherry-pick behavior in face of conflictsLibravatar Jonathan Nieder1-0/+198