summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | t3404: todo list with commented-out commands only abortsAlban Gruin2018-08-101-0/+10
| | |/ | |/|
* | | Merge branch 'en/sequencer-empty-edit-result-aborts'Junio C Hamano2018-09-241-4/+3
|\ \ \
| * | | sequencer: fix --allow-empty-message behavior, make it smarterElijah Newren2018-09-131-4/+3
* | | | Merge branch 'pw/rebase-i-author-script-fix'Junio C Hamano2018-09-041-3/+15
|\ \ \ \
| * | | | sequencer: fix quoting in write_author_scriptPhillip Wood2018-08-071-3/+15
* | | | | Merge branch 'sg/test-must-be-empty'Junio C Hamano2018-08-271-3/+2
|\ \ \ \ \
| * | | | | tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor2018-08-211-3/+2
* | | | | | Merge branch 'es/rebase-i-author-script-fix'Junio C Hamano2018-08-171-1/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | sequencer: fix "rebase -i --root" corrupting author header timestampEric Sunshine2018-07-311-1/+1
| * | | | | sequencer: fix "rebase -i --root" corrupting author header timezoneEric Sunshine2018-07-311-1/+1
| * | | | | sequencer: fix "rebase -i --root" corrupting author headerEric Sunshine2018-07-311-1/+9
| | |_|_|/ | |/| | |
* | | | | Merge branch 'bc/sequencer-export-work-tree-as-well'Junio C Hamano2018-08-021-0/+9
|\ \ \ \ \
| * | | | | sequencer: pass absolute GIT_WORK_TREE to exec commandsbrian m. carlson2018-07-161-0/+9
* | | | | | Merge branch 'es/test-fixes'Junio C Hamano2018-08-021-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | t: use test_write_lines() instead of series of 'echo' commandsEric Sunshine2018-07-031-3/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'jc/t3404-one-shot-export-fix'Junio C Hamano2018-07-241-1/+8
|\ \ \ \ \
| * | | | | t3404: fix use of "VAR=VAL cmd" with a shell functionJunio C Hamano2018-07-121-1/+8
| | |/ / / | |/| | |
* | | | | Merge branch 'en/rebase-consistency'Junio C Hamano2018-07-241-3/+4
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | git-rebase: make --allow-empty-message the defaultElijah Newren2018-06-271-3/+4
| | |/ | |/|
* | | sequencer: do not squash 'reword' commits when we hit conflictsPhillip Wood2018-06-191-0/+28
|/ /
* | t3404: check root commit in 'rebase -i --root reword root commit'Todd Zullinger2018-06-191-1/+2
* | rebase --root: fix amending root commit messagesJohannes Schindelin2018-06-181-1/+1