summaryrefslogtreecommitdiffstats
path: root/t/t3404-rebase-interactive.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* rebase: fix regression in rebase.useBuiltin=false test modeÆvar Arnfjörð Bjarmason2019-02-141-3/+6
* Merge branch 'pw/rebase-x-sanity-check'Junio C Hamano2019-02-071-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-031-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-031-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
* | rebase --root: demonstrate a bug while amending root commit messagesTodd Zullinger2018-06-181-0/+9
* | rebase -i --root: let the sequencer handle even the initial partJohannes Schindelin2018-05-061-6/+13
* | Merge branch 'ps/test-chmtime-get'Junio C Hamano2018-04-251-1/+1
|\ \
| * | t/helper: 'test-chmtime (--get|-g)' to print only the mtimePaul-Sebastian Ungureanu2018-04-091-1/+1
| |/
* | Merge branch 'nd/combined-test-helper'Junio C Hamano2018-04-111-2/+2
|\ \
| * | t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy2018-03-271-2/+2
* | | Merge branch 'ps/contains-id-error-message'Junio C Hamano2018-04-101-4/+2
|\ \ \ | |/ / |/| |
| * | parse-options: do not show usage upon invalid option valuePaul-Sebastian Ungureanu2018-03-221-4/+2
| |/
* | Merge branch 'nd/rebase-show-current-patch'Junio C Hamano2018-03-061-0/+8
|\ \
| * | rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy2018-02-121-1/+4
| * | rebase: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-121-0/+5
| |/
* | Merge branch 'pw/sequencer-in-process-commit'Junio C Hamano2018-02-131-0/+14
|\ \ | |/ |/|
| * sequencer: assign only free()able strings to gpg_signJohannes Schindelin2017-12-221-0/+10
| * t3404: check intermediate squash messagesPhillip Wood2017-11-101-0/+4
* | t3404: add test case for abbreviated commandsLiam Beguin2017-12-051-0/+22
|/
* Merge branch 'jk/rebase-i-exec-gitdir-fix'Junio C Hamano2017-11-061-0/+11
|\
| * sequencer: pass absolute GIT_DIR to exec commandsJacob Keller2017-11-021-0/+11
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 00:24:03 +0100