summaryrefslogtreecommitdiff
path: root/t/lib-rebase.sh
Commit message (Expand)AuthorAgeFilesLines
* rebase -i: fix parsing of "fixup -C<commit>"Phillip Wood2023-02-231-2/+6
* rebase -i: match whole word in is_command()Phillip Wood2023-02-231-1/+1
* sequencer: rewrite update-refs as user edits todo listDerrick Stolee2022-07-191-0/+15
* rebase -r: don't write .git/MERGE_MSG when fast-forwardingPhillip Wood2021-08-231-2/+8
* rebase -r: make 'merge -c' behave like rewordPhillip Wood2021-08-201-0/+50
* Merge branch 'cm/rebase-i-updates'Junio C Hamano2021-03-261-3/+4
|\
| * t/lib-rebase: update the documentation of FAKE_LINESCharvi Mendiratta2021-02-101-3/+4
* | Merge branch 'cm/rebase-i'Junio C Hamano2021-03-261-0/+4
|\ \ | |/
| * t3437: test script for fixup [-C|-c] options in interactive rebaseCharvi Mendiratta2021-01-291-0/+4
* | tests: remove support for GIT_TEST_GETTEXT_POISONÆvar Arnfjörð Bjarmason2021-01-211-1/+0
|/
* Merge branch 'pw/post-commit-from-sequencer'Junio C Hamano2019-11-101-0/+28
|\
| * t3404: remove uneeded calls to set_fake_editorPhillip Wood2019-10-161-0/+28
* | t/lib-rebase: prepare for testing `git rebase --rebase-merges`Johannes Schindelin2019-07-311-4/+5
|/
* Merge branch 'sg/test-rebase-editor-fix'Junio C Hamano2018-11-061-2/+2
|\
| * t3404-rebase-interactive: test abbreviated commandsJohannes Sixt2018-10-291-2/+2
* | Merge branch 'js/rebase-i-shortopt'Junio C Hamano2018-11-021-1/+1
|\ \
| * | rebase -i: recognize short commands without argumentsJohannes Sixt2018-10-261-1/+1
* | | Merge branch 'js/rebase-i-break'Junio C Hamano2018-11-021-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * rebase -i: introduce the 'break' commandJohannes Schindelin2018-10-121-1/+1
* | t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh'SZEDER Gábor2018-08-231-3/+3
|/
* i18n: rebase-interactive: mark comments of squash for translationVasco Almeida2016-06-171-0/+1
* git rebase -i: add static check for commands and SHA-1Galan Rémi2015-06-301-0/+5
* git-rebase -i: add command "drop" to remove a commitGalan Rémi2015-06-301-2/+2
* test: replace shebangs with descriptions in shell librariesJonathan Nieder2013-11-261-1/+1
* Merge branch 'maint'Junio C Hamano2013-07-011-0/+2
|\
| * lib-rebase: document exec_ in FAKE_LINESAndrew Pimlott2013-07-011-0/+2
* | lib-rebase: style: use write_script, <<-\EOFap/rebase-multiple-fixupsAndrew Pimlott2013-07-011-38/+36
* | rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott2013-06-271-0/+14
* | add tests for rebasing with patch-equivalence presentMartin von Zweigbergk2013-06-071-0/+17
* | add simple tests of consistency across rebase typesMartin von Zweigbergk2013-06-071-0/+16
|/
* rebase -i: add exec command to launch a shell commandMatthieu Moy2010-08-111-0/+2
* rebase -i: Enclose sed command substitution in quotesMichael Haggerty2010-01-221-1/+1
* t3404: Test the commit count in commit messages generated by "rebase -i"Michael Haggerty2010-01-141-1/+5
* lib-rebase: Allow comments and blank lines to be added to the rebase scriptMichael Haggerty2010-01-121-5/+16
* lib-rebase: Provide clearer debugging info about what the editor didMichael Haggerty2010-01-121-2/+3
* Add a command "fixup" to rebase --interactiveMichael Haggerty2009-12-071-3/+4
* Teach 'rebase -i' the command "reword"Björn Gustavsson2009-10-071-3/+3
* lib-rebase.sh: Document what set_fake_editor() doesJohannes Schindelin2009-01-281-0/+12
* t3404 & t3411: undo copy&pasteJohannes Schindelin2009-01-281-0/+36
View Lorry Controller Status