summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
Commit message (Expand)AuthorAgeFilesLines
* tests: don't assume a .git/info for .git/info/sparse-checkoutÆvar Arnfjörð Bjarmason2022-06-061-0/+2
* cherry-pick: use better advice messageZheNing Hu2021-08-231-7/+10
* tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason2021-02-101-6/+6
* t3[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-2/+2
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* Merge branch 'en/sequencer-merge-labels'Junio C Hamano2020-08-191-10/+10
|\
| * sequencer: avoid garbled merge machinery messages due to commit labelsElijah Newren2020-08-141-10/+10
* | t: don't spuriously close and reopen quotesMartin Ågren2020-08-061-2/+2
|/
* Merge branch 'pw/advise-rebase-skip'Junio C Hamano2020-03-251-0/+23
|\
| * cherry-pick: check commit error messagesPhillip Wood2019-12-061-0/+23
* | t3507: use test_path_is_missing()Denton Liu2020-01-271-4/+4
* | t3507: fix indentationDenton Liu2020-01-271-12/+12
|/
* Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano2019-05-131-0/+39
|\
| * commit/reset: try to clean up sequencer statePhillip Wood2019-04-171-0/+39
* | Merge branch 'dl/merge-cleanup-scissors-fix'Junio C Hamano2019-05-091-21/+107
|\ \
| * | cherry-pick/revert: add scissors line on merge conflictDenton Liu2019-04-191-0/+86
| * | t3507: clean up styleDenton Liu2019-04-181-21/+21
| |/
* | cherry-pick --continue: remember optionsPhillip Wood2019-03-181-2/+2
* | cherry-pick: demonstrate option amnesiaPhillip Wood2019-03-181-0/+24
|/
* merge-recursive: preserve skip_worktree bit when necessaryElijah Newren2018-07-271-1/+1
* t3507: add a testcase showing failure with sparse checkoutBen Peart2018-07-271-0/+13
* merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hintJunio C Hamano2014-10-281-8/+34
* tests: move test_cmp_rev to test-lib-functionsMartin von Zweigbergk2012-12-221-6/+0
* cherry-pick: don't forget -s on failureMiklos Vajna2012-09-141-0/+32
* cherry-pick: No advice to commit if --no-commitph/cherry-pick-advice-refinementPhil Hord2012-02-221-0/+14
* revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder2011-11-221-0/+54
* revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-061-0/+15
* i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507Junio C Hamano2011-04-131-2/+2
* Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-1/+1
|\
| * i18n: git-revert split up "could not revert/apply" messageÆvar Arnfjörð Bjarmason2011-03-091-1/+1
* | 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
View Lorry Controller Status