summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
AgeCommit message (Expand)AuthorFilesLines
2021-08-23cherry-pick: use better advice messageLibravatar ZheNing Hu1-7/+10
2021-02-10tests: remove most uses of test_i18ncmpLibravatar Ævar Arnfjörð Bjarmason1-6/+6
2020-11-19t3[5-9]*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-2/+2
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-08-19Merge branch 'en/sequencer-merge-labels'Libravatar Junio C Hamano1-10/+10
2020-08-14sequencer: avoid garbled merge machinery messages due to commit labelsLibravatar Elijah Newren1-10/+10
2020-08-06t: don't spuriously close and reopen quotesLibravatar Martin Ågren1-2/+2
2020-03-25Merge branch 'pw/advise-rebase-skip'Libravatar Junio C Hamano1-0/+23
2020-01-27t3507: use test_path_is_missing()Libravatar Denton Liu1-4/+4
2020-01-27t3507: fix indentationLibravatar Denton Liu1-12/+12
2019-12-06cherry-pick: check commit error messagesLibravatar Phillip Wood1-0/+23
2019-05-13Merge branch 'pw/clean-sequencer-state-upon-final-commit'Libravatar Junio C Hamano1-0/+39
2019-05-09Merge branch 'dl/merge-cleanup-scissors-fix'Libravatar Junio C Hamano1-21/+107
2019-04-19cherry-pick/revert: add scissors line on merge conflictLibravatar Denton Liu1-0/+86
2019-04-18t3507: clean up styleLibravatar Denton Liu1-21/+21
2019-04-17commit/reset: try to clean up sequencer stateLibravatar Phillip Wood1-0/+39
2019-03-18cherry-pick --continue: remember optionsLibravatar Phillip Wood1-2/+2
2019-03-18cherry-pick: demonstrate option amnesiaLibravatar Phillip Wood1-0/+24
2018-07-27merge-recursive: preserve skip_worktree bit when necessaryLibravatar Elijah Newren1-1/+1
2018-07-27t3507: add a testcase showing failure with sparse checkoutLibravatar Ben Peart1-0/+13
2014-10-28merge & sequencer: turn "Conflicts:" hint into a commentLibravatar Junio C Hamano1-8/+34
2012-12-22tests: move test_cmp_rev to test-lib-functionsLibravatar Martin von Zweigbergk1-6/+0
2012-09-14cherry-pick: don't forget -s on failureLibravatar Miklos Vajna1-0/+32
2012-02-22cherry-pick: No advice to commit if --no-commitLibravatar Phil Hord1-0/+14
2011-11-22revert: write REVERT_HEAD pseudoref during conflicted revertLibravatar Jonathan Nieder1-0/+54
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 17:13:22 +0000