| Commit message (Expand) | Author | Age | Files | Lines |
* | rebase -i: use the rebase--helper builtin | Johannes Schindelin | 2017-02-09 | 1 | -0/+13 |
* | Merge branch 'jk/rebase-i-squash-count-fix' | Junio C Hamano | 2017-01-18 | 1 | -1/+1 |
|\ |
|
| * | rebase--interactive: count squash commits above 10 correctlyjk/rebase-i-squash-count-fix | Jeff King | 2017-01-07 | 1 | -1/+1 |
| * | Merge branch 'rt/rebase-i-broken-insn-advise' into maint | Junio C Hamano | 2016-09-29 | 1 | -1/+1 |
| |\ |
|
| * \ | Merge branch 'jk/rebase-i-drop-ident-check' into maint | Junio C Hamano | 2016-09-29 | 1 | -3/+0 |
| |\ \ |
|
* | \ \ | Merge branch 'va/i18n-even-more' | Junio C Hamano | 2016-12-27 | 1 | -1/+2 |
|\ \ \ \ |
|
| * | | | | i18n: fix misconversion in shell scriptsva/i18n-even-more | Junio C Hamano | 2016-12-20 | 1 | -1/+2 |
* | | | | | Merge branch 'js/rebase-i-commentchar-fix' | Junio C Hamano | 2016-11-23 | 1 | -2/+11 |
|\ \ \ \ \ |
|
| * | | | | | rebase -i: handle core.commentChar=autojs/rebase-i-commentchar-fix | Johannes Schindelin | 2016-11-21 | 1 | -2/+11 |
* | | | | | | Merge branch 'rt/rebase-i-broken-insn-advise' | Junio C Hamano | 2016-09-26 | 1 | -1/+1 |
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | rebase -i: improve advice on bad instruction linesrt/rebase-i-broken-insn-advise | Ralf Thielow | 2016-09-07 | 1 | -1/+1 |
* | | | | | | Merge branch 'jk/rebase-i-drop-ident-check' | Junio C Hamano | 2016-09-21 | 1 | -3/+0 |
|\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | /
| | |_|_|/
| |/| | | |
|
| * | | | | rebase-interactive: drop early check for valid identjk/rebase-i-drop-ident-check | Jeff King | 2016-07-29 | 1 | -3/+0 |
* | | | | | git-rebase--interactive: fix English grammar | Alex Henrie | 2016-09-08 | 1 | -1/+1 |
| |/ / /
|/| | | |
|
* | | | | i18n: fix git rebase interactive commit messages | Jean-Noel Avila | 2016-08-24 | 1 | -42/+3 |
* | | | | Merge branch 'js/rebase-i-progress-tidy' | Junio C Hamano | 2016-08-08 | 1 | -1/+1 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | rebase-interactive: trim leading whitespace from progress countjs/rebase-i-progress-tidy | Johannes Sixt | 2016-07-28 | 1 | -1/+1 |
* | | | | Merge branch 'ps/rebase-i-auto-unstash-upon-abort' | Junio C Hamano | 2016-07-13 | 1 | -0/+1 |
|\ \ \ \ |
|
| * | | | | rebase -i: restore autostash on abortps/rebase-i-auto-unstash-upon-abort | Patrick Steinhardt | 2016-06-29 | 1 | -0/+1 |
* | | | | | Merge branch 'va/i18n-even-more' | Junio C Hamano | 2016-07-13 | 1 | -118/+172 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | i18n: rebase-interactive: mark comments of squash for translation | Vasco Almeida | 2016-06-17 | 1 | -13/+56 |
| * | | | | i18n: rebase-interactive: mark here-doc strings for translation | Vasco Almeida | 2016-06-17 | 1 | -15/+15 |
| | |/ /
| |/| | |
|
| * | | | i18n: rebase-interactive: mark strings for translation | Vasco Almeida | 2016-06-17 | 1 | -90/+101 |
* | | | | Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' | Junio C Hamano | 2016-06-27 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | rebase: update comment about FreeBSD /bin/shem/newer-freebsd-shells-are-fine-with-returns | Ed Maste | 2016-06-17 | 1 | -2/+2 |
* | | | | | Merge branch 'js/rebase-i-dedup-call-to-rerere' | Junio C Hamano | 2016-06-03 | 1 | -1/+0 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | rebase -i: remove an unnecessary 'rerere' invocationjs/rebase-i-dedup-call-to-rerere | Johannes Sixt | 2016-05-31 | 1 | -1/+0 |
| |/ / / |
|
| * | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint | Junio C Hamano | 2015-08-03 | 1 | -1/+5 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'mm/rebase-i-post-rewrite-exec' into maint | Junio C Hamano | 2015-06-25 | 1 | -5/+5 |
| |\ \ \ \ |
|
* | \ \ \ \ | Merge branch 'jk/test-z-n-unquoted' | Junio C Hamano | 2016-05-23 | 1 | -2/+2 |
|\ \ \ \ \ \ |
|
| * | | | | | | always quote shell arguments to test -z/-njk/test-z-n-unquoted | Jeff King | 2016-05-14 | 1 | -2/+2 |
* | | | | | | | Merge branch 'jk/rebase-interative-eval-fix' | Junio C Hamano | 2016-05-17 | 1 | -0/+1 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | /
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | rebase--interactive: avoid empty list in shell for-loopjk/rebase-interative-eval-fixjk/rebase-interactive-eval-fix | Jeff King | 2016-05-10 | 1 | -0/+1 |
* | | | | | | Merge branch 'rt/rebase-i-shorten-stop-report' | Junio C Hamano | 2016-04-13 | 1 | -1/+2 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | rebase-i: print an abbreviated hash when stop for editingrt/rebase-i-shorten-stop-report | Ralf Thielow | 2016-03-28 | 1 | -1/+2 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge branch 'jc/sane-grep' | Junio C Hamano | 2016-03-16 | 1 | -1/+2 |
|\ \ \ \ \ |
|
| * | | | | | rebase-i: clarify "is this commit relevant?" testjc/sane-grep | Junio C Hamano | 2016-03-10 | 1 | -1/+2 |
| |/ / / / |
|
* | | | | | rebase -i: remember merge options beyond continue actionsfr/rebase-i-continue-preserve-options | Fabian Ruch | 2015-12-11 | 1 | -11/+7 |
|/ / / / |
|
* | | | | rebase-i-exec: Allow space in SHELL_PATHfm/shell-path-whitespace | Fredrik Medley | 2015-11-13 | 1 | -1/+1 |
* | | | | Merge branch 'gr/rebase-i-drop-warn' into maint | Junio C Hamano | 2015-11-03 | 1 | -0/+12 |
|\ \ \ \ |
|
| * | | | | rebase-i: work around Windows CRLF line endingsgr/rebase-i-drop-warn | Junio C Hamano | 2015-10-28 | 1 | -0/+12 |
* | | | | | Merge branch 'gr/rebase-i-drop-warn' into maint | Junio C Hamano | 2015-10-16 | 1 | -35/+31 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | rebase-i: loosen over-eager check_bad_cmd check | Matthieu Moy | 2015-10-05 | 1 | -33/+29 |
| * | | | | rebase-i: explicitly accept tab as separator in commands | Matthieu Moy | 2015-10-02 | 1 | -2/+2 |
* | | | | | Merge branch 'gr/rebase-i-drop-warn' | Junio C Hamano | 2015-08-03 | 1 | -4/+188 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | git rebase -i: add static check for commands and SHA-1 | Galan Rémi | 2015-06-30 | 1 | -0/+72 |
| * | | | | git rebase -i: warn about removed commits | Galan Rémi | 2015-06-30 | 1 | -3/+114 |
| * | | | | git-rebase -i: add command "drop" to remove a commit | Galan Rémi | 2015-06-30 | 1 | -1/+2 |
* | | | | | Merge branch 'mr/rebase-i-customize-insn-sheet' | Junio C Hamano | 2015-08-03 | 1 | -3/+17 |
|\ \ \ \ \ |
|
| * | | | | | git-rebase--interactive.sh: add config option for custom instruction formatmr/rebase-i-customize-insn-sheet | Michael Rappazzo | 2015-06-15 | 1 | -3/+17 |