summaryrefslogtreecommitdiff
path: root/git-legacy-rebase.sh
Commit message (Expand)AuthorAgeFilesLines
* rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason2019-03-201-770/+0
* Merge branch 'js/rebase-i-redo-exec-fix'Junio C Hamano2019-02-081-6/+0
|\
| * Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Johannes Schindelin2019-02-061-6/+0
* | Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano2019-02-061-35/+30
|\ \
| * | rebase: implement --merge via the interactive machineryElijah Newren2019-01-071-22/+21
| * | git-legacy-rebase: simplify unnecessary triply-nested ifElijah Newren2018-12-281-12/+8
| * | git-rebase, sequencer: extend --quiet option for the interactive machineryElijah Newren2018-12-281-1/+1
| * | rebase: fix incompatible options error messageElijah Newren2018-12-281-2/+2
| * | rebase: make builtin and legacy script error messages the sameElijah Newren2018-12-281-6/+6
* | | Merge branch 'pw/no-editor-in-rebase-i-implicit'Junio C Hamano2019-02-051-2/+2
|\ \ \ | |_|/ |/| |
| * | implicit interactive rebase: don't run sequence editorPhillip Wood2019-01-281-2/+2
| |/
* | rebase: introduce a shortcut for --reschedule-failed-execJohannes Schindelin2018-12-111-0/+6
* | rebase: add a config option to default to --reschedule-failed-execJohannes Schindelin2018-12-111-0/+2
* | rebase: introduce --reschedule-failed-execJohannes Schindelin2018-12-111-1/+15
|/
* rebase --stat: fix when rebasing to an unrelated historyJohannes Schindelin2018-11-301-2/+8
* legacy-rebase: backport -C<n> and --whitespace=<option> checksJohannes Schindelin2018-11-211-0/+8
* Merge branch 'ag/rebase-i-in-c'Junio C Hamano2018-11-021-5/+42
* Merge branch 'pk/rebase-in-c'Junio C Hamano2018-11-021-3/+3
* rebase: refactor common shell functions into their own filePratik Karki2018-08-061-67/+2
* rebase: start implementing it as a builtinPratik Karki2018-08-061-0/+773
View Lorry Controller Status