summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
AgeCommit message (Expand)Author
2020-11-19t3[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-08-19Merge branch 'en/sequencer-merge-labels'Junio C Hamano
2020-08-14sequencer: avoid garbled merge machinery messages due to commit labelsElijah Newren
2020-08-06t: don't spuriously close and reopen quotesMartin Ågren
2020-03-25Merge branch 'pw/advise-rebase-skip'Junio C Hamano
2020-01-27t3507: use test_path_is_missing()Denton Liu
2020-01-27t3507: fix indentationDenton Liu
2019-12-06cherry-pick: check commit error messagesPhillip Wood
2019-05-13Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano
2019-05-08Merge branch 'dl/merge-cleanup-scissors-fix'Junio C Hamano
2019-04-19cherry-pick/revert: add scissors line on merge conflictDenton Liu
2019-04-18t3507: clean up styleDenton Liu
2019-04-17commit/reset: try to clean up sequencer statePhillip Wood
2019-03-18cherry-pick --continue: remember optionsPhillip Wood
2019-03-18cherry-pick: demonstrate option amnesiaPhillip Wood
2018-07-27merge-recursive: preserve skip_worktree bit when necessaryElijah Newren
2018-07-27t3507: add a testcase showing failure with sparse checkoutBen Peart
2014-10-28merge & sequencer: turn "Conflicts:" hint into a commentJunio C Hamano
2012-12-23tests: move test_cmp_rev to test-lib-functionsMartin von Zweigbergk
2012-09-14cherry-pick: don't forget -s on failureMiklos Vajna
2012-02-22cherry-pick: No advice to commit if --no-commitPhil Hord
2011-11-22revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder
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