summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'dl/rebase-i-keep-base'Junio C Hamano2019-09-301-1/+1
|\ \
| * | rebase: fast-forward --onto in more casesDenton Liu2019-08-271-1/+1
* | | Merge branch 'dl/use-sq-from-test-lib'Junio C Hamano2019-09-301-1/+0
|\ \ \
| * | | t: use common $SQ variableDenton Liu2019-09-061-1/+0
| |/ /
* | | Merge branch 'bc/hash-independent-tests-part-5'Junio C Hamano2019-09-301-11/+11
|\ \ \
| * | | t3404: abstract away SHA-1-specific constantsbrian m. carlson2019-08-201-11/+11
| |/ /
| * | Merge branch 'sg/rebase-progress'Junio C Hamano2019-07-091-70/+50
| |\ \
| * \ \ Merge branch 'js/t3404-typofix'Junio C Hamano2019-07-091-1/+1
| |\ \ \
* | | | | t: use LF variable defined in the test harnessJunio C Hamano2019-09-051-2/+0
| |_|_|/ |/| | |
* | | | Merge branch 'sg/rebase-progress' into maintJunio C Hamano2019-07-291-70/+50
|\ \ \ \ | | |_|/ | |/| |
| * | | t3404: make the 'rebase.missingCommitsCheck=ignore' test more focusedSZEDER Gábor2019-06-241-14/+1
| * | | t3404: modernize here doc styleSZEDER Gábor2019-06-241-65/+58
| |/ /
* | | Merge branch 'js/t3404-typofix' into maintJunio C Hamano2019-07-291-1/+1
|\ \ \ | |/ / |/| / | |/
| * t3404: fix a typoJohannes Schindelin2019-06-141-1/+1
* | rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason2019-03-201-6/+3
* | rebase: fix regression in rebase.useBuiltin=false test modeÆvar Arnfjörð Bjarmason2019-02-131-3/+6
* | Merge branch 'pw/rebase-x-sanity-check'Junio C Hamano2019-02-061-0/+19
|\ \
| * | rebase -x: sanity check commandPhillip Wood2019-01-291-0/+19
* | | implicit interactive rebase: don't run sequence editorPhillip Wood2019-01-281-0/+5
|/ /
* | Merge branch 'js/rebase-p-tests'Junio C Hamano2018-11-131-11/+12
|\ \
| * | tests: optionally skip `git rebase -p` testsJohannes Schindelin2018-11-021-4/+4
| * | t3404: decouple some test cases from outcomes of previous test casesJohannes Schindelin2018-11-021-7/+8
* | | Merge branch 'sg/test-rebase-editor-fix'Junio C Hamano2018-11-061-5/+5
|\ \ \
| * | | t3404-rebase-interactive: test abbreviated commandsJohannes Sixt2018-10-291-5/+5
* | | | Merge branch 'ag/rebase-i-in-c'Junio C Hamano2018-11-021-0/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | rebase -i: rewrite complete_action() in CAlban Gruin2018-08-291-1/+1
View Lorry Controller Status