aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAge
* Merge branch 'jk/rebase-i-squash-count-fix'Junio C Hamano2017-01-18
|\
| * rebase--interactive: count squash commits above 10 correctlyJeff King2017-01-07
| * Merge branch 'rt/rebase-i-broken-insn-advise' into maintJunio C Hamano2016-09-29
| |\
| * \ Merge branch 'jk/rebase-i-drop-ident-check' into maintJunio C Hamano2016-09-29
| |\ \
* | \ \ Merge branch 'va/i18n-even-more'Junio C Hamano2016-12-27
|\ \ \ \
| * | | | i18n: fix misconversion in shell scriptsJunio C Hamano2016-12-20
* | | | | Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano2016-11-23
|\ \ \ \ \
| * | | | | rebase -i: handle core.commentChar=autoJohannes Schindelin2016-11-21
* | | | | | Merge branch 'rt/rebase-i-broken-insn-advise'Junio C Hamano2016-09-26
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | rebase -i: improve advice on bad instruction linesRalf Thielow2016-09-07
* | | | | | Merge branch 'jk/rebase-i-drop-ident-check'Junio C Hamano2016-09-21
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | rebase-interactive: drop early check for valid identJeff King2016-07-29
* | | | | git-rebase--interactive: fix English grammarAlex Henrie2016-09-08
| |/ / / |/| | |
* | | | i18n: fix git rebase interactive commit messagesJean-Noel Avila2016-08-24
* | | | Merge branch 'js/rebase-i-progress-tidy'Junio C Hamano2016-08-08
|\ \ \ \ | |/ / / |/| | |
| * | | rebase-interactive: trim leading whitespace from progress countJohannes Sixt2016-07-28
* | | | Merge branch 'ps/rebase-i-auto-unstash-upon-abort'Junio C Hamano2016-07-13
|\ \ \ \
| * | | | rebase -i: restore autostash on abortPatrick Steinhardt2016-06-29
* | | | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-13
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | i18n: rebase-interactive: mark comments of squash for translationVasco Almeida2016-06-17
| * | | | i18n: rebase-interactive: mark here-doc strings for translationVasco Almeida2016-06-17
| | |/ / | |/| |
| * | | i18n: rebase-interactive: mark strings for translationVasco Almeida2016-06-17
* | | | Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'Junio C Hamano2016-06-27
|\ \ \ \
| * | | | rebase: update comment about FreeBSD /bin/shEd Maste2016-06-17
* | | | | Merge branch 'js/rebase-i-dedup-call-to-rerere'Junio C Hamano2016-06-03
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | rebase -i: remove an unnecessary 'rerere' invocationJohannes Sixt2016-05-31
| |/ / /
| * | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-03
| |\ \ \
| * \ \ \ Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2015-06-25
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/test-z-n-unquoted'Junio C Hamano2016-05-23
|\ \ \ \ \ \
| * | | | | | always quote shell arguments to test -z/-nJeff King2016-05-14
* | | | | | | Merge branch 'jk/rebase-interative-eval-fix'Junio C Hamano2016-05-17
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | rebase--interactive: avoid empty list in shell for-loopJeff King2016-05-10
* | | | | | Merge branch 'rt/rebase-i-shorten-stop-report'Junio C Hamano2016-04-13
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | rebase-i: print an abbreviated hash when stop for editingRalf Thielow2016-03-28
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jc/sane-grep'Junio C Hamano2016-03-16
|\ \ \ \ \
| * | | | | rebase-i: clarify "is this commit relevant?" testJunio C Hamano2016-03-10
| |/ / / /
* | | | | rebase -i: remember merge options beyond continue actionsFabian Ruch2015-12-11
|/ / / /
* | | | rebase-i-exec: Allow space in SHELL_PATHFredrik Medley2015-11-13
* | | | Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-11-03
|\ \ \ \
| * | | | rebase-i: work around Windows CRLF line endingsJunio C Hamano2015-10-28
* | | | | Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ | |/ / / /
| * | | | rebase-i: loosen over-eager check_bad_cmd checkMatthieu Moy2015-10-05
| * | | | rebase-i: explicitly accept tab as separator in commandsMatthieu Moy2015-10-02
* | | | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-08-03
|\ \ \ \ \ | |/ / / /
| * | | | git rebase -i: add static check for commands and SHA-1Galan Rémi2015-06-30
| * | | | git rebase -i: warn about removed commitsGalan Rémi2015-06-30
| * | | | git-rebase -i: add command "drop" to remove a commitGalan Rémi2015-06-30
* | | | | Merge branch 'mr/rebase-i-customize-insn-sheet'Junio C Hamano2015-08-03
|\ \ \ \ \
| * | | | | git-rebase--interactive.sh: add config option for custom instruction formatMichael Rappazzo2015-06-15
* | | | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Junio C Hamano2015-07-13
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |