summaryrefslogtreecommitdiffstats
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorLines
2018-06-01Merge branch 'js/rebase-recreate-merge'Junio C Hamano-1/+1
2018-05-30Merge branch 'bc/object-id'Junio C Hamano-1/+3
2018-05-28git-rebase--interactive: fix copy-paste mistakeOrgad Shaneh-1/+1
2018-05-06rebase -i --root: let the sequencer handle even the initial partJohannes Schindelin-1/+3
2018-05-02Update shell scripts to compute empty tree object IDbrian m. carlson-1/+3
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin-0/+1
2018-04-26rebase: introduce the --rebase-merges optionJohannes Schindelin-0/+1
2018-04-26sequencer: introduce the `merge` commandJohannes Schindelin-0/+4
2018-04-26sequencer: introduce new commands to reset the revisionJohannes Schindelin-0/+2
2018-04-26git-rebase--interactive: clarify argumentsStefan Beller-7/+7
2018-04-25Merge branch 'pw/rebase-signoff'Junio C Hamano-3/+3
2018-03-29rebase: extend --signoff supportPhillip Wood-3/+3
2018-03-23rebase: remove merges_option and a blank lineWink Saville-9/+1
2018-03-23rebase: remove unused code paths from git_rebase__interactive__preserve_mergesWink Saville-83/+69
2018-03-23rebase: remove unused code paths from git_rebase__interactiveWink Saville-91/+4
2018-03-23rebase: add and use git_rebase__interactive__preserve_mergesWink Saville-0/+108
2018-03-23rebase: extract functions out of git_rebase__interactiveWink Saville-71/+111
2018-03-23rebase: reindent function git_rebase__interactiveWink Saville-217/+215
2018-03-23rebase: update invocation of rebase dot-sourced scriptsWink Saville-11/+0
2018-03-23rebase-interactive: simplify pick_on_preserving_mergesWink Saville-10/+7
2018-03-06Merge branch 'nd/rebase-show-current-patch'Junio C Hamano-0/+6
2018-02-27Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Junio C Hamano-1/+1
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy-1/+4
2018-02-12rebase: add --show-current-patchNguyễn Thái Ngọc Duy-0/+3
2018-02-08rebase -p: fix incorrect commit message when calling `git merge`.Gregory Herrero-1/+1
2018-02-07rebase: add --allow-empty-message optionGenki Sky-10/+15
2018-01-10Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Junio C Hamano-3/+6
2018-01-05rebase -p: fix quoting when calling `git merge`Johannes Schindelin-3/+6
2017-12-27rebase: do not continue when the todo list generation failedJohannes Schindelin-1/+2
2017-12-05rebase -i -x: add exec commands via the rebase--helperLiam Beguin-22/+1
2017-11-21Merge branch 'ad/rebase-i-serie-typofix' into maintJunio C Hamano-1/+1
2017-11-15Merge branch 'ad/rebase-i-serie-typofix'Junio C Hamano-1/+1
2017-11-09rebase -i: fix comment typoAdam Dinwoodie-1/+1
2017-10-03Merge branch 'js/rebase-i-final'Junio C Hamano-333/+40
2017-08-02rebase -i: honor --rerere-autoupdatePhillip Wood-3/+4
2017-07-27rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin-89/+1
2017-07-27rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin-38/+3
2017-07-27rebase -i: check for missing commits in the rebase--helperJohannes Schindelin-159/+5
2017-07-27rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin-25/+2
2017-07-27rebase -i: do not invent onelines when expanding/collapsing SHA-1sJohannes Schindelin-1/+6
2017-07-27rebase -i: remove useless indentationJohannes Schindelin-7/+7
2017-07-27rebase -i: generate the script via rebase--helperJohannes Schindelin-21/+23
2017-05-09doc: replace more gmane linksJunio C Hamano-1/+1
2017-02-09rebase -i: use the rebase--helper builtinJohannes Schindelin-0/+13
2017-01-18Merge branch 'jk/rebase-i-squash-count-fix'Junio C Hamano-1/+1
2017-01-07rebase--interactive: count squash commits above 10 correctlyJeff King-1/+1
2016-12-27Merge branch 'va/i18n-even-more'Junio C Hamano-1/+2
2016-12-20i18n: fix misconversion in shell scriptsJunio C Hamano-1/+2
2016-11-23Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano-2/+11
2016-11-21rebase -i: handle core.commentChar=autoJohannes Schindelin-2/+11