summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ag/rebase-p'Junio C Hamano2018-06-251-796/+8
|\
| * rebase: remove -p code from git-rebase--interactive.shAlban Gruin2018-06-011-794/+8
* | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2018-06-011-1/+1
|\ \
| * | git-rebase--interactive: fix copy-paste mistakeOrgad Shaneh2018-05-281-1/+1
* | | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-1/+3
|\ \ \ | |_|/ |/| |
| * | Update shell scripts to compute empty tree object IDbrian m. carlson2018-05-021-1/+3
* | | rebase -i --root: let the sequencer handle even the initial partJohannes Schindelin2018-05-061-1/+3
| |/ |/|
* | rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin2018-04-261-0/+1
* | rebase: introduce the --rebase-merges optionJohannes Schindelin2018-04-261-0/+1
* | sequencer: introduce the `merge` commandJohannes Schindelin2018-04-261-0/+4
* | sequencer: introduce new commands to reset the revisionJohannes Schindelin2018-04-261-0/+2
* | git-rebase--interactive: clarify argumentsStefan Beller2018-04-261-7/+7
* | Merge branch 'pw/rebase-signoff'Junio C Hamano2018-04-251-3/+3
|\ \ | |/ |/|
| * rebase: extend --signoff supportPhillip Wood2018-03-291-3/+3
* | rebase: remove merges_option and a blank linews/rebase-pWink Saville2018-03-231-9/+1
* | rebase: remove unused code paths from git_rebase__interactive__preserve_mergesWink Saville2018-03-231-83/+69
* | rebase: remove unused code paths from git_rebase__interactiveWink Saville2018-03-231-91/+4
* | rebase: add and use git_rebase__interactive__preserve_mergesWink Saville2018-03-231-0/+108
* | rebase: extract functions out of git_rebase__interactiveWink Saville2018-03-231-71/+111
* | rebase: reindent function git_rebase__interactiveWink Saville2018-03-231-217/+215
* | rebase: update invocation of rebase dot-sourced scriptsWink Saville2018-03-231-11/+0
* | rebase-interactive: simplify pick_on_preserving_mergesWink Saville2018-03-231-10/+7
* | Merge branch 'nd/rebase-show-current-patch'Junio C Hamano2018-03-061-0/+6
|\ \
| * | 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/+3
| |/
* | Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Junio C Hamano2018-02-271-1/+1
|\ \
| * | rebase -p: fix incorrect commit message when calling `git merge`.js/fix-merge-arg-quoting-in-rebase-pGregory Herrero2018-02-081-1/+1
* | | rebase: add --allow-empty-message optiongs/rebase-allow-empty-messageGenki Sky2018-02-071-10/+15
| |/ |/|
* | Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Junio C Hamano2018-01-101-3/+6
|\ \ | |/
| * rebase -p: fix quoting when calling `git merge`Johannes Schindelin2018-01-051-3/+6
| * Merge branch 'ad/rebase-i-serie-typofix' into maintJunio C Hamano2017-11-211-1/+1
| |\
* | | rebase: do not continue when the todo list generation failedJohannes Schindelin2017-12-271-1/+2
* | | rebase -i -x: add exec commands via the rebase--helperLiam Beguin2017-12-051-22/+1
* | | Merge branch 'ad/rebase-i-serie-typofix'Junio C Hamano2017-11-151-1/+1
|\ \ \ | |/ / |/| / | |/
| * rebase -i: fix comment typoad/rebase-i-serie-typofixAdam Dinwoodie2017-11-091-1/+1
* | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-031-333/+40
|\ \
| * | rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-271-89/+1
| * | rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin2017-07-271-38/+3
| * | rebase -i: check for missing commits in the rebase--helperJohannes Schindelin2017-07-271-159/+5
| * | rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin2017-07-271-25/+2
| * | rebase -i: do not invent onelines when expanding/collapsing SHA-1sJohannes Schindelin2017-07-271-1/+6
| * | rebase -i: remove useless indentationJohannes Schindelin2017-07-271-7/+7
| * | rebase -i: generate the script via rebase--helperJohannes Schindelin2017-07-271-21/+23
* | | rebase -i: honor --rerere-autoupdatePhillip Wood2017-08-021-3/+4
|/ /
* | doc: replace more gmane linksab/doc-replace-gmane-linksJunio C Hamano2017-05-091-1/+1
* | rebase -i: use the rebase--helper builtinJohannes Schindelin2017-02-091-0/+13
|/
* Merge branch 'jk/rebase-i-squash-count-fix'Junio C Hamano2017-01-181-1/+1
|\
| * rebase--interactive: count squash commits above 10 correctlyjk/rebase-i-squash-count-fixJeff King2017-01-071-1/+1
| * Merge branch 'rt/rebase-i-broken-insn-advise' into maintJunio C Hamano2016-09-291-1/+1
| |\
| * \ Merge branch 'jk/rebase-i-drop-ident-check' into maintJunio C Hamano2016-09-291-3/+0
| |\ \
View Lorry Controller Status