summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorFilesLines
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
2016-05-10rebase--interactive: avoid empty list in shell for-loopLibravatar Jeff King1-0/+1
2016-04-13Merge branch 'rt/rebase-i-shorten-stop-report'Libravatar Junio C Hamano1-1/+2
2016-03-28rebase-i: print an abbreviated hash when stop for editingLibravatar Ralf Thielow1-1/+2
2016-03-16Merge branch 'jc/sane-grep'Libravatar Junio C Hamano1-1/+2
2016-03-10rebase-i: clarify "is this commit relevant?" testLibravatar Junio C Hamano1-1/+2
2015-12-11rebase -i: remember merge options beyond continue actionsLibravatar Fabian Ruch1-11/+7
2015-11-13rebase-i-exec: Allow space in SHELL_PATHLibravatar Fredrik Medley1-1/+1
2015-11-03Merge branch 'gr/rebase-i-drop-warn' into maintLibravatar Junio C Hamano1-0/+12
2015-10-28rebase-i: work around Windows CRLF line endingsLibravatar Junio C Hamano1-0/+12
2015-10-16Merge branch 'gr/rebase-i-drop-warn' into maintLibravatar Junio C Hamano1-35/+31
2015-10-05rebase-i: loosen over-eager check_bad_cmd checkLibravatar Matthieu Moy1-33/+29
2015-10-02rebase-i: explicitly accept tab as separator in commandsLibravatar Matthieu Moy1-2/+2
2015-08-03Merge branch 'gr/rebase-i-drop-warn'Libravatar Junio C Hamano1-4/+188
2015-08-03Merge branch 'mr/rebase-i-customize-insn-sheet'Libravatar Junio C Hamano1-3/+17
2015-08-03Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintLibravatar Junio C Hamano1-1/+5
2015-07-13Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Libravatar Junio C Hamano1-1/+5
2015-06-30git rebase -i: add static check for commands and SHA-1Libravatar Galan Rémi1-0/+72
2015-06-30git rebase -i: warn about removed commitsLibravatar Galan Rémi1-3/+114
2015-06-30git-rebase -i: add command "drop" to remove a commitLibravatar Galan Rémi1-1/+2
2015-06-29rebase -i: do not leave a CHERRY_PICK_HEAD file behindLibravatar Johannes Schindelin1-1/+5
2015-06-25Merge branch 'mm/rebase-i-post-rewrite-exec' into maintLibravatar Junio C Hamano1-5/+5