summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* rebase -i: use the rebase--helper builtinJohannes Schindelin2017-02-091-0/+13
* Merge branch 'jk/rebase-i-squash-count-fix'Junio C Hamano2017-01-181-1/+1
|\
| * rebase--interactive: count squash commits above 10 correctlyjk/rebase-i-squash-count-fixJeff King2017-01-071-1/+1
| * Merge branch 'rt/rebase-i-broken-insn-advise' into maintJunio C Hamano2016-09-291-1/+1
| |\
| * \ Merge branch 'jk/rebase-i-drop-ident-check' into maintJunio C Hamano2016-09-291-3/+0
| |\ \
* | \ \ Merge branch 'va/i18n-even-more'Junio C Hamano2016-12-271-1/+2
|\ \ \ \
| * | | | i18n: fix misconversion in shell scriptsva/i18n-even-moreJunio C Hamano2016-12-201-1/+2
* | | | | Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano2016-11-231-2/+11
|\ \ \ \ \
| * | | | | rebase -i: handle core.commentChar=autojs/rebase-i-commentchar-fixJohannes Schindelin2016-11-211-2/+11
* | | | | | Merge branch 'rt/rebase-i-broken-insn-advise'Junio C Hamano2016-09-261-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | rebase -i: improve advice on bad instruction linesrt/rebase-i-broken-insn-adviseRalf Thielow2016-09-071-1/+1
* | | | | | Merge branch 'jk/rebase-i-drop-ident-check'Junio C Hamano2016-09-211-3/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | rebase-interactive: drop early check for valid identjk/rebase-i-drop-ident-checkJeff King2016-07-291-3/+0
* | | | | git-rebase--interactive: fix English grammarAlex Henrie2016-09-081-1/+1
| |/ / / |/| | |
* | | | i18n: fix git rebase interactive commit messagesJean-Noel Avila2016-08-241-42/+3
* | | | Merge branch 'js/rebase-i-progress-tidy'Junio C Hamano2016-08-081-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | rebase-interactive: trim leading whitespace from progress countjs/rebase-i-progress-tidyJohannes Sixt2016-07-281-1/+1
* | | | Merge branch 'ps/rebase-i-auto-unstash-upon-abort'Junio C Hamano2016-07-131-0/+1
|\ \ \ \
| * | | | rebase -i: restore autostash on abortps/rebase-i-auto-unstash-upon-abortPatrick Steinhardt2016-06-291-0/+1
* | | | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-131-118/+172
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | i18n: rebase-interactive: mark comments of squash for translationVasco Almeida2016-06-171-13/+56
| * | | | i18n: rebase-interactive: mark here-doc strings for translationVasco Almeida2016-06-171-15/+15
| | |/ / | |/| |
| * | | i18n: rebase-interactive: mark strings for translationVasco Almeida2016-06-171-90/+101
* | | | Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'Junio C Hamano2016-06-271-2/+2
|\ \ \ \
| * | | | rebase: update comment about FreeBSD /bin/shem/newer-freebsd-shells-are-fine-with-returnsEd Maste2016-06-171-2/+2
* | | | | Merge branch 'js/rebase-i-dedup-call-to-rerere'Junio C Hamano2016-06-031-1/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | rebase -i: remove an unnecessary 'rerere' invocationjs/rebase-i-dedup-call-to-rerereJohannes Sixt2016-05-311-1/+0
| |/ / /
| * | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-031-1/+5
| |\ \ \
| * \ \ \ Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2015-06-251-5/+5
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/test-z-n-unquoted'Junio C Hamano2016-05-231-2/+2
|\ \ \ \ \ \
| * | | | | | always quote shell arguments to test -z/-njk/test-z-n-unquotedJeff King2016-05-141-2/+2
* | | | | | | Merge branch 'jk/rebase-interative-eval-fix'Junio C Hamano2016-05-171-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | rebase--interactive: avoid empty list in shell for-loopjk/rebase-interative-eval-fixjk/rebase-interactive-eval-fixJeff King2016-05-101-0/+1
* | | | | | Merge branch 'rt/rebase-i-shorten-stop-report'Junio C Hamano2016-04-131-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | rebase-i: print an abbreviated hash when stop for editingrt/rebase-i-shorten-stop-reportRalf Thielow2016-03-281-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jc/sane-grep'Junio C Hamano2016-03-161-1/+2
|\ \ \ \ \
| * | | | | rebase-i: clarify "is this commit relevant?" testjc/sane-grepJunio C Hamano2016-03-101-1/+2
| |/ / / /
* | | | | rebase -i: remember merge options beyond continue actionsfr/rebase-i-continue-preserve-optionsFabian Ruch2015-12-111-11/+7
|/ / / /
* | | | rebase-i-exec: Allow space in SHELL_PATHfm/shell-path-whitespaceFredrik Medley2015-11-131-1/+1
* | | | Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-11-031-0/+12
|\ \ \ \
| * | | | rebase-i: work around Windows CRLF line endingsgr/rebase-i-drop-warnJunio C Hamano2015-10-281-0/+12
* | | | | Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-10-161-35/+31
|\ \ \ \ \ | |/ / / /
| * | | | rebase-i: loosen over-eager check_bad_cmd checkMatthieu Moy2015-10-051-33/+29
| * | | | rebase-i: explicitly accept tab as separator in commandsMatthieu Moy2015-10-021-2/+2
* | | | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-08-031-4/+188
|\ \ \ \ \ | |/ / / /
| * | | | git rebase -i: add static check for commands and SHA-1Galan Rémi2015-06-301-0/+72
| * | | | git rebase -i: warn about removed commitsGalan Rémi2015-06-301-3/+114
| * | | | git-rebase -i: add command "drop" to remove a commitGalan Rémi2015-06-301-1/+2
* | | | | Merge branch 'mr/rebase-i-customize-insn-sheet'Junio C Hamano2015-08-031-3/+17
|\ \ \ \ \
| * | | | | git-rebase--interactive.sh: add config option for custom instruction formatmr/rebase-i-customize-insn-sheetMichael Rappazzo2015-06-151-3/+17
View Lorry Controller Status