summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2018-02-27Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Libravatar Junio C Hamano1-1/+1
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
2016-09-29Merge branch 'rt/rebase-i-broken-insn-advise' into maintLibravatar Junio C Hamano1-1/+1
2016-09-29Merge branch 'jk/rebase-i-drop-ident-check' into maintLibravatar Junio C Hamano1-3/+0
2016-09-26Merge branch 'rt/rebase-i-broken-insn-advise'Libravatar Junio C Hamano1-1/+1
2016-09-21Merge branch 'jk/rebase-i-drop-ident-check'Libravatar Junio C Hamano1-3/+0
2016-09-08git-rebase--interactive: fix English grammarLibravatar Alex Henrie1-1/+1
2016-09-07rebase -i: improve advice on bad instruction linesLibravatar Ralf Thielow1-1/+1
2016-08-24i18n: fix git rebase interactive commit messagesLibravatar Jean-Noel Avila1-42/+3
2016-08-08Merge branch 'js/rebase-i-progress-tidy'Libravatar Junio C Hamano1-1/+1
2016-07-29rebase-interactive: drop early check for valid identLibravatar Jeff King1-3/+0
2016-07-28rebase-interactive: trim leading whitespace from progress countLibravatar Johannes Sixt1-1/+1
2016-07-13Merge branch 'ps/rebase-i-auto-unstash-upon-abort'Libravatar Junio C Hamano1-0/+1
2016-07-13Merge branch 'va/i18n-even-more'Libravatar Junio C Hamano1-118/+172
2016-06-29rebase -i: restore autostash on abortLibravatar Patrick Steinhardt1-0/+1
2016-06-27Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'Libravatar Junio C Hamano1-2/+2
2016-06-17i18n: rebase-interactive: mark strings for translationLibravatar Vasco Almeida1-90/+101
2016-06-17i18n: rebase-interactive: mark comments of squash for translationLibravatar Vasco Almeida1-13/+56
2016-06-17i18n: rebase-interactive: mark here-doc strings for translationLibravatar Vasco Almeida1-15/+15
2016-06-17rebase: update comment about FreeBSD /bin/shLibravatar Ed Maste1-2/+2
2016-06-03Merge branch 'js/rebase-i-dedup-call-to-rerere'Libravatar Junio C Hamano1-1/+0
2016-05-31rebase -i: remove an unnecessary 'rerere' invocationLibravatar Johannes Sixt1-1/+0
2016-05-23Merge branch 'jk/test-z-n-unquoted'Libravatar Junio C Hamano1-2/+2
2016-05-17Merge branch 'jk/rebase-interative-eval-fix'Libravatar Junio C Hamano1-0/+1
2016-05-14always quote shell arguments to test -z/-nLibravatar Jeff King1-2/+2