summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* 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 valueps/contains-id-error-messagePaul-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_HEADnd/rebase-show-current-patchNguyễ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-111-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 commandsjk/rebase-i-exec-gitdir-fixJacob Keller2017-11-021-0/+11
* | t3404: relax rebase.missingCommitsCheck testsJohannes Schindelin2017-07-271-18/+4
* | Merge branch 'pw/rebase-i-regression-fix-tests'Junio C Hamano2017-06-301-0/+7
|\ \
| * | rebase -i: add test for reflog messagePhillip Wood2017-06-191-0/+7
| |/
* | tests: fix tests broken under GETTEXT_POISON=YesPleaseÆvar Arnfjörð Bjarmason2017-05-111-7/+7
|/
* rebase -i: use the rebase--helper builtinJohannes Schindelin2017-02-091-1/+1
* sequencer: update reading author-scriptJohannes Schindelin2017-01-171-0/+16
* Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano2016-11-231-0/+11
|\
| * rebase -i: handle core.commentChar=autojs/rebase-i-commentchar-fixJohannes Schindelin2016-11-211-1/+1
| * rebase -i: highlight problems with core.commentcharJohannes Schindelin2016-11-211-0/+11
* | rebase -i: improve advice on bad instruction linesrt/rebase-i-broken-insn-adviseRalf Thielow2016-09-071-3/+3
* | t3404: become resilient to GETTEXT_POISONVasco Almeida2016-08-121-1/+1
* | Merge branch 'js/rebase-i-tests'Junio C Hamano2016-07-281-0/+8
|\ \
| * | t3404: add a test for the --gpg-sign optionJohannes Schindelin2016-07-071-0/+8
* | | Merge branch 'js/t3404-grammo-fix'Junio C Hamano2016-07-131-1/+1
|\ \ \
| * | | t3404: fix a grammo (commands are ran -> commands are run)js/t3404-grammo-fixJohannes Schindelin2016-06-291-1/+1
* | | | tests: unpack-trees: update to use test_i18n* functionsVasco Almeida2016-06-171-2/+2
* | | | i18n: rebase-interactive: mark here-doc strings for translationVasco Almeida2016-06-171-7/+7
| |/ / |/| |
* | | t3404: fix typojs/t3404-typofixJohannes Schindelin2016-05-101-1/+1
* | | Merge branch 'jk/use-write-script-more'Junio C Hamano2016-04-221-4/+3
|\ \ \ | | |/ | |/|
| * | t3404: use write_scriptjk/use-write-script-moreJunio C Hamano2016-04-121-4/+3
* | | t3404: cleanup double empty lines between testssb/rebase-xStefan Beller2016-03-181-6/+0
* | | rebase: decouple --exec from --interactiveStefan Beller2016-03-181-7/+6
|/ /
* | rebase -i: remember merge options beyond continue actionsfr/rebase-i-continue-preserve-optionsFabian Ruch2015-12-111-0/+16
* | Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano2015-12-111-1/+1
|\ \
| * | t3404: fix quoting of redirect for some versions of bashcb/t3404-shellquoteCharles Bailey2015-12-041-1/+1
* | | Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-11-031-0/+12
|\ \ \
| * | | rebase-i: work around Windows CRLF line endingsgr/rebase-i-drop-warnJunio C Hamano2015-10-281-1/+1
| * | | t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsJohannes Schindelin2015-10-281-0/+12
| |/ /
View Lorry Controller Status