| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'nd/rebase-show-current-patch' | Junio C Hamano | 2018-03-06 | 1 | -1/+7 |
|\ |
|
| * | rebase: introduce and use pseudo-ref REBASE_HEADnd/rebase-show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -0/+1 |
| * | rebase: add --show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -1/+6 |
* | | rebase: add --allow-empty-message optiongs/rebase-allow-empty-message | Genki Sky | 2018-02-07 | 1 | -0/+5 |
|/ |
|
* | rebase: rebasing can also be done when HEAD is detachedks/rebase-error-messages | Kaartic Sivaraam | 2017-12-19 | 1 | -2/+14 |
* | rebase: distinguish user input by quoting it | Kaartic Sivaraam | 2017-12-19 | 1 | -2/+2 |
* | rebase: consistently use branch_name variable | Kaartic Sivaraam | 2017-12-19 | 1 | -7/+10 |
* | Merge branch 'ks/rebase-no-git-foo' | Junio C Hamano | 2017-11-27 | 1 | -2/+2 |
|\ |
|
| * | git-rebase: clean up dashed-usages in messagesks/rebase-no-git-foo | Kaartic Sivaraam | 2017-11-21 | 1 | -2/+2 |
| * | Merge branch 'pw/rebase-i-regression-fix-tests' into maint | Junio C Hamano | 2017-07-10 | 1 | -2/+2 |
| |\ |
|
* | \ | Merge branch 'tz/redirect-fix' | Junio C Hamano | 2017-11-27 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | rebase: fix stderr redirect in apply_autostash()tz/redirect-fix | Todd Zullinger | 2017-11-14 | 1 | -1/+1 |
* | | | | Merge branch 'bc/rev-parse-parseopt-fix' | Junio C Hamano | 2017-10-03 | 1 | -0/+3 |
|\ \ \ \ |
|
| * | | | | git-rebase: don't ignore unexpected command line arguments | Brandon Casey | 2017-09-19 | 1 | -0/+3 |
| |/ / / |
|
* | | | | Merge branch 'kw/rebase-progress' | Junio C Hamano | 2017-08-23 | 1 | -0/+6 |
|\ \ \ \ |
|
| * | | | | rebase: turn on progress option by default for format-patchkw/rebase-progress | Kevin Willford | 2017-08-14 | 1 | -0/+6 |
| |/ / / |
|
* | | | | rebase: make resolve message clearer for inexperienced userswd/rebase-conflict-guide | William Duclot | 2017-07-17 | 1 | -3/+4 |
|/ / / |
|
* | | | Merge branch 'pw/rebase-i-regression-fix-tests' | Junio C Hamano | 2017-06-30 | 1 | -2/+2 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | sequencer: print autostash messages to stderr | Johannes Schindelin | 2017-06-19 | 1 | -2/+2 |
* | | Merge branch 'gb/rebase-signoff' | Junio C Hamano | 2017-04-26 | 1 | -1/+2 |
|\ \
| |/
|/| |
|
| * | rebase: pass --[no-]signoff option to git amgb/rebase-signoff | Giuseppe Bilotta | 2017-04-18 | 1 | -1/+2 |
* | | Merge branch 'nd/rebase-forget' | Junio C Hamano | 2016-12-19 | 1 | -1/+5 |
|\ \
| |/
|/| |
|
| * | rebase: add --quit to cleanup rebase, leave everything else untouchednd/rebase-forget | Nguyễn Thái Ngọc Duy | 2016-12-11 | 1 | -1/+5 |
* | | i18n: git-sh-setup.sh: mark strings for translation | Vasco Almeida | 2016-06-17 | 1 | -1/+0 |
* | | i18n: rebase: mark placeholder for translation | Vasco Almeida | 2016-06-17 | 1 | -1/+1 |
* | | i18n: rebase: fix marked string to use eval_gettext variant | Vasco Almeida | 2016-06-17 | 1 | -1/+1 |
* | | Merge branch 'jc/commit-tree-ignore-commit-gpgsign' | Junio C Hamano | 2016-05-13 | 1 | -1/+4 |
|\ \ |
|
| * | | commit-tree: do not pay attention to commit.gpgsignjc/commit-tree-ignore-commit-gpgsign | Junio C Hamano | 2016-05-03 | 1 | -1/+4 |
| * | | Merge branch 'jk/rebase-quiet-noop' into maint | Junio C Hamano | 2015-05-26 | 1 | -1/+1 |
| |\ \ |
|
* | | | | rebase: decouple --exec from --interactive | Stefan Beller | 2016-03-18 | 1 | -6/+1 |
| |_|/
|/| | |
|
* | | | Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' | Junio C Hamano | 2016-01-26 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | rebase: ignore failures from "gc --auto"jk/ok-to-fail-gc-auto-in-rebase | Jeff King | 2016-01-13 | 1 | -1/+1 |
* | | | | Merge branch 'jk/rebase-no-autostash' | Junio C Hamano | 2015-10-05 | 1 | -1/+4 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | rebase: support --no-autostash | John Keeping | 2015-09-10 | 1 | -1/+4 |
| |/ / |
|
* | | | Merge branch 'jk/rebase-quiet-noop' | Junio C Hamano | 2015-05-11 | 1 | -1/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | rebase: silence "git checkout" for noop rebasejk/rebase-quiet-noop | Jeff King | 2015-04-28 | 1 | -1/+1 |
| * | | Merge branch 'rr/rebase-autostash-fix' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+10 |
| |\ \ |
|
* | | | | *.sh: avoid hardcoding $GIT_DIR/hooks/... | Nguyễn Thái Ngọc Duy | 2014-12-01 | 1 | -2/+2 |
| |_|/
|/| | |
|
* | | | rebase: omit patch-identical commits with --fork-pointjk/rebase-am-fork-point | John Keeping | 2014-07-16 | 1 | -3/+4 |
* | | | Merge branch 'rr/rebase-autostash-fix' | Junio C Hamano | 2014-06-16 | 1 | -1/+10 |
|\ \ \
| | |/
| |/| |
|
| * | | rebase -i: handle "Nothing to do" case with autostash | Ramkumar Ramachandra | 2014-05-19 | 1 | -1/+10 |
* | | | Merge branch 'ep/shell-command-substitution' | Junio C Hamano | 2014-06-03 | 1 | -4/+4 |
|\ \ \
| |_|/
|/| | |
|
| * | | git-rebase.sh: use the $( ... ) construct for command substitution | Elia Pinto | 2014-04-23 | 1 | -4/+4 |
* | | | Merge branch 'km/avoid-non-function-return-in-rebase' | Junio C Hamano | 2014-04-21 | 1 | -10/+1 |
|\ \ \ |
|
| * | | | Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"km/avoid-non-function-return-in-rebase | Kyle J. McKay | 2014-04-17 | 1 | -10/+1 |
* | | | | Merge branch 'bg/rebase-off-of-previous-branch' | Junio C Hamano | 2014-03-28 | 1 | -0/+4 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | rebase: allow "-" short-hand for the previous branch | Brian Gesiak | 2014-03-19 | 1 | -0/+4 |
| |/ / |
|
* | | | rebase: add the --gpg-sign option | Nicolas Vigier | 2014-02-11 | 1 | -0/+11 |
* | | | rebase: parse options in stuck-long mode | Nicolas Vigier | 2014-02-11 | 1 | -28/+22 |
* | | | rebase: don't try to match -M option | Nicolas Vigier | 2014-02-03 | 1 | -1/+1 |