summaryrefslogtreecommitdiffstats
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorLines
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
2016-09-29Merge branch 'rt/rebase-i-broken-insn-advise' into maintJunio C Hamano-1/+1
2016-09-29Merge branch 'jk/rebase-i-drop-ident-check' into maintJunio C Hamano-3/+0
2016-09-26Merge branch 'rt/rebase-i-broken-insn-advise'Junio C Hamano-1/+1
2016-09-21Merge branch 'jk/rebase-i-drop-ident-check'Junio C Hamano-3/+0
2016-09-08git-rebase--interactive: fix English grammarAlex Henrie-1/+1
2016-09-07rebase -i: improve advice on bad instruction linesRalf Thielow-1/+1
2016-08-24i18n: fix git rebase interactive commit messagesJean-Noel Avila-42/+3
2016-08-08Merge branch 'js/rebase-i-progress-tidy'Junio C Hamano-1/+1
2016-07-29rebase-interactive: drop early check for valid identJeff King-3/+0
2016-07-28rebase-interactive: trim leading whitespace from progress countJohannes Sixt-1/+1
2016-07-13Merge branch 'ps/rebase-i-auto-unstash-upon-abort'Junio C Hamano-0/+1
2016-07-13Merge branch 'va/i18n-even-more'Junio C Hamano-118/+172
2016-06-29rebase -i: restore autostash on abortPatrick Steinhardt-0/+1
2016-06-27Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'Junio C Hamano-2/+2
2016-06-17i18n: rebase-interactive: mark strings for translationVasco Almeida-90/+101
2016-06-17i18n: rebase-interactive: mark comments of squash for translationVasco Almeida-13/+56
2016-06-17i18n: rebase-interactive: mark here-doc strings for translationVasco Almeida-15/+15
2016-06-17rebase: update comment about FreeBSD /bin/shEd Maste-2/+2
2016-06-03Merge branch 'js/rebase-i-dedup-call-to-rerere'Junio C Hamano-1/+0
2016-05-31rebase -i: remove an unnecessary 'rerere' invocationJohannes Sixt-1/+0
2016-05-23Merge branch 'jk/test-z-n-unquoted'Junio C Hamano-2/+2
2016-05-17Merge branch 'jk/rebase-interative-eval-fix'Junio C Hamano-0/+1
2016-05-14always quote shell arguments to test -z/-nJeff King-2/+2
2016-05-10rebase--interactive: avoid empty list in shell for-loopJeff King-0/+1
2016-04-13Merge branch 'rt/rebase-i-shorten-stop-report'Junio C Hamano-1/+2
2016-03-28rebase-i: print an abbreviated hash when stop for editingRalf Thielow-1/+2