summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2018-06-01Merge branch 'js/rebase-recreate-merge'Libravatar Junio C Hamano1-1/+1
2018-05-30Merge branch 'bc/object-id'Libravatar Junio C Hamano1-1/+3
2018-05-28git-rebase--interactive: fix copy-paste mistakeLibravatar Orgad Shaneh1-1/+1
2018-05-06rebase -i --root: let the sequencer handle even the initial partLibravatar Johannes Schindelin1-1/+3
2018-05-02Update shell scripts to compute empty tree object IDLibravatar brian m. carlson1-1/+3
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsLibravatar Johannes Schindelin1-0/+1
2018-04-26rebase: introduce the --rebase-merges optionLibravatar Johannes Schindelin1-0/+1
2018-04-26sequencer: introduce the `merge` commandLibravatar Johannes Schindelin1-0/+4
2018-04-26sequencer: introduce new commands to reset the revisionLibravatar Johannes Schindelin1-0/+2
2018-04-26git-rebase--interactive: clarify argumentsLibravatar Stefan Beller1-7/+7
2018-04-25Merge branch 'pw/rebase-signoff'Libravatar Junio C Hamano1-3/+3
2018-03-29rebase: extend --signoff supportLibravatar Phillip Wood1-3/+3
2018-03-23rebase: remove merges_option and a blank lineLibravatar Wink Saville1-9/+1
2018-03-23rebase: remove unused code paths from git_rebase__interactive__preserve_mergesLibravatar Wink Saville1-83/+69
2018-03-23rebase: remove unused code paths from git_rebase__interactiveLibravatar Wink Saville1-91/+4
2018-03-23rebase: add and use git_rebase__interactive__preserve_mergesLibravatar Wink Saville1-0/+108
2018-03-23rebase: extract functions out of git_rebase__interactiveLibravatar Wink Saville1-71/+111
2018-03-23rebase: reindent function git_rebase__interactiveLibravatar Wink Saville1-217/+215
2018-03-23rebase: update invocation of rebase dot-sourced scriptsLibravatar Wink Saville1-11/+0
2018-03-23rebase-interactive: simplify pick_on_preserving_mergesLibravatar Wink Saville1-10/+7
2018-03-06Merge branch 'nd/rebase-show-current-patch'Libravatar Junio C Hamano1-0/+6
2018-02-27Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Libravatar Junio C Hamano1-1/+1
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADLibravatar Nguyễn Thái Ngọc Duy1-1/+4
2018-02-12rebase: add --show-current-patchLibravatar Nguyễn Thái Ngọc Duy1-0/+3
2018-02-08rebase -p: fix incorrect commit message when calling `git merge`.Libravatar Gregory Herrero1-1/+1
2018-02-07rebase: add --allow-empty-message optionLibravatar Genki Sky1-10/+15
2018-01-10Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Libravatar Junio C Hamano1-3/+6
2018-01-05rebase -p: fix quoting when calling `git merge`Libravatar Johannes Schindelin1-3/+6
2017-12-27rebase: do not continue when the todo list generation failedLibravatar Johannes Schindelin1-1/+2
2017-12-05rebase -i -x: add exec commands via the rebase--helperLibravatar Liam Beguin1-22/+1
2017-11-21Merge branch 'ad/rebase-i-serie-typofix' into maintLibravatar Junio C Hamano1-1/+1
2017-11-15Merge branch 'ad/rebase-i-serie-typofix'Libravatar Junio C Hamano1-1/+1
2017-11-09rebase -i: fix comment typoLibravatar Adam Dinwoodie1-1/+1
2017-10-03Merge branch 'js/rebase-i-final'Libravatar Junio C Hamano1-333/+40
2017-08-02rebase -i: honor --rerere-autoupdateLibravatar Phillip Wood1-3/+4
2017-07-27rebase -i: rearrange fixup/squash lines using the rebase--helperLibravatar Johannes Schindelin1-89/+1
2017-07-27rebase -i: skip unnecessary picks using the rebase--helperLibravatar Johannes Schindelin1-38/+3
2017-07-27rebase -i: check for missing commits in the rebase--helperLibravatar Johannes Schindelin1-159/+5
2017-07-27rebase -i: also expand/collapse the SHA-1s via the rebase--helperLibravatar Johannes Schindelin1-25/+2
2017-07-27rebase -i: do not invent onelines when expanding/collapsing SHA-1sLibravatar Johannes Schindelin1-1/+6
2017-07-27rebase -i: remove useless indentationLibravatar Johannes Schindelin1-7/+7
2017-07-27rebase -i: generate the script via rebase--helperLibravatar Johannes Schindelin1-21/+23
2017-05-09doc: replace more gmane linksLibravatar Junio C Hamano1-1/+1
2017-02-09rebase -i: use the rebase--helper builtinLibravatar Johannes Schindelin1-0/+13
2017-01-18Merge branch 'jk/rebase-i-squash-count-fix'Libravatar Junio C Hamano1-1/+1
2017-01-07rebase--interactive: count squash commits above 10 correctlyLibravatar Jeff King1-1/+1
2016-12-27Merge branch 'va/i18n-even-more'Libravatar Junio C Hamano1-1/+2
2016-12-20i18n: fix misconversion in shell scriptsLibravatar Junio C Hamano1-1/+2
2016-11-23Merge branch 'js/rebase-i-commentchar-fix'Libravatar Junio C Hamano1-2/+11
2016-11-21rebase -i: handle core.commentChar=autoLibravatar Johannes Schindelin1-2/+11