summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/rebase-i-parse-fix'Junio C Hamano2023-02-281-5/+7
|\
| * rebase -i: match whole word in is_command()Phillip Wood2023-02-231-5/+7
* | rebase -i: check labels and refs when parsing todo listPhillip Wood2023-02-211-0/+23
|/
* rebase --update-refs: avoid unintended ref deletionVictoria Dye2022-11-071-0/+107
* t: remove \{m,n\} from BRE grep usageĐoàn Trần Công Danh2022-09-211-3/+3
* sequencer: notify user of --update-refs activityDerrick Stolee2022-07-191-4/+33
* rebase: add rebase.updateRefs config optionDerrick Stolee2022-07-191-0/+14
* sequencer: rewrite update-refs as user edits todo listDerrick Stolee2022-07-191-0/+139
* rebase: update refs from 'update-ref' commandsDerrick Stolee2022-07-191-0/+17
* rebase: add --update-refs optionDerrick Stolee2022-07-191-0/+74
* tests: change "mkdir -p && write_script" to use "test_hook"Ævar Arnfjörð Bjarmason2022-03-171-8/+2
* Merge branch 'es/test-chain-lint'Junio C Hamano2022-01-031-2/+2
|\
| * t0000-t3999: detect and signal failure within loopEric Sunshine2021-12-131-2/+2
* | tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when neededJohannes Schindelin2021-12-051-2/+0
|/
* Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-181-76/+0
|\
| * tests: stop testing `git rebase --preserve-merges`Johannes Schindelin2021-09-071-76/+0
* | tests: remove leftover untracked filesElijah Newren2021-09-121-0/+1
* | rebase -i: add another reword testPhillip Wood2021-08-231-0/+13
|/
* Merge branch 'ab/detox-gettext-tests'Junio C Hamano2021-02-251-19/+19
|\
| * tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason2021-02-101-12/+12
| * tests: remove most uses of C_LOCALE_OUTPUTÆvar Arnfjörð Bjarmason2021-02-101-7/+7
* | test-lib-functions: remove bug-inducing "diagnostics" helper paramÆvar Arnfjörð Bjarmason2021-02-121-1/+2
|/
* Merge branch 'js/default-branch-name-tests-final-stretch'Junio C Hamano2021-01-251-0/+3
|\
| * tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* | t3404: do not depend on any specific default branch nameJohannes Schindelin2020-11-241-44/+45
|/
* rebase -i: stop overwriting ORIG_HEAD bufferPhillip Wood2020-11-041-0/+11
* Merge branch 'ak/sequencer-fix-find-uniq-abbrev'Junio C Hamano2020-08-191-0/+6
|\
| * rebase -i: fix possibly wrong onto hash in todoAntti Keränen2020-08-131-0/+6
* | Merge branch 'en/sequencer-merge-labels'Junio C Hamano2020-08-191-1/+1
|\ \
| * | sequencer: avoid garbled merge machinery messages due to commit labelsElijah Newren2020-08-141-1/+1
| |/
* | t3404: prepare 'short SHA-1 collision' tests for SHA-256Johannes Schindelin2020-07-301-9/+40
|/
* Merge branch 'pw/advise-rebase-skip'Junio C Hamano2020-03-251-19/+45
|\
| * commit: give correct advice for empty commit during a rebasePhillip Wood2019-12-061-0/+26
| * t3404: use test_cmp_revPhillip Wood2019-12-061-19/+19
* | Merge branch 'en/rebase-backend'Junio C Hamano2020-03-021-9/+10
|\ \
| * | rebase: rename the two primary rebase backendsElijah Newren2020-02-161-1/+1
| * | rebase tests: mark tests specific to the am-backend with --amElijah Newren2020-02-161-1/+1
| * | rebase: drop '-i' from the reflog for interactive-based rebasesElijah Newren2020-02-161-5/+5
| * | t3404: directly test the behavior of interestElijah Newren2020-01-171-3/+4
* | | rebase-interactive: warn if commit is dropped with `rebase --edit-todo'Alban Gruin2020-01-281-0/+121
* | | rebase -i: also avoid SHA-1 collisions with missingCommitsCheckJohannes Schindelin2020-01-231-0/+2
* | | rebase -i: re-fix short SHA-1 collisionJohannes Schindelin2020-01-231-2/+13
|/ /
* | t3404: fix indentationJohannes Schindelin2019-12-091-5/+5
|/
* Merge branch 'pw/post-commit-from-sequencer'Junio C Hamano2019-11-101-228/+368
|\
| * sequencer: run post-commit hookPhillip Wood2019-10-161-0/+19
| * t3404: remove uneeded calls to set_fake_editorPhillip Wood2019-10-161-20/+5
| * t3404: set $EDITOR in subshellPhillip Wood2019-10-161-204/+342
| * t3404: remove unnecessary subshellPhillip Wood2019-10-161-4/+2
* | Merge branch 'pw/rebase-i-show-HEAD-to-reword'Junio C Hamano2019-10-111-3/+13
|\ \ | |/
| * rebase -i: always update HEAD before rewordingPhillip Wood2019-08-191-3/+13
View Lorry Controller Status