summaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/rebase-i-regression-fix-tests'Junio C Hamano2017-06-301-2/+2
|\
| * sequencer: print autostash messages to stderrJohannes Schindelin2017-06-191-2/+2
* | Merge branch 'gb/rebase-signoff'Junio C Hamano2017-04-261-1/+2
|\ \ | |/ |/|
| * rebase: pass --[no-]signoff option to git amgb/rebase-signoffGiuseppe Bilotta2017-04-181-1/+2
* | Merge branch 'nd/rebase-forget'Junio C Hamano2016-12-191-1/+5
|\ \ | |/ |/|
| * rebase: add --quit to cleanup rebase, leave everything else untouchednd/rebase-forgetNguyễn Thái Ngọc Duy2016-12-111-1/+5
* | i18n: git-sh-setup.sh: mark strings for translationVasco Almeida2016-06-171-1/+0
* | i18n: rebase: mark placeholder for translationVasco Almeida2016-06-171-1/+1
* | i18n: rebase: fix marked string to use eval_gettext variantVasco Almeida2016-06-171-1/+1
* | Merge branch 'jc/commit-tree-ignore-commit-gpgsign'Junio C Hamano2016-05-131-1/+4
|\ \
| * | commit-tree: do not pay attention to commit.gpgsignjc/commit-tree-ignore-commit-gpgsignJunio C Hamano2016-05-031-1/+4
| * | Merge branch 'jk/rebase-quiet-noop' into maintJunio C Hamano2015-05-261-1/+1
| |\ \
* | | | rebase: decouple --exec from --interactiveStefan Beller2016-03-181-6/+1
| |_|/ |/| |
* | | Merge branch 'jk/ok-to-fail-gc-auto-in-rebase'Junio C Hamano2016-01-261-1/+1
|\ \ \
| * | | rebase: ignore failures from "gc --auto"jk/ok-to-fail-gc-auto-in-rebaseJeff King2016-01-131-1/+1
* | | | Merge branch 'jk/rebase-no-autostash'Junio C Hamano2015-10-051-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | rebase: support --no-autostashJohn Keeping2015-09-101-1/+4
| |/ /
* | | Merge branch 'jk/rebase-quiet-noop'Junio C Hamano2015-05-111-1/+1
|\ \ \ | | |/ | |/|
| * | rebase: silence "git checkout" for noop rebasejk/rebase-quiet-noopJeff King2015-04-281-1/+1
| * | Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano2014-06-251-1/+10
| |\ \
* | | | *.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy2014-12-011-2/+2
| |_|/ |/| |
* | | rebase: omit patch-identical commits with --fork-pointjk/rebase-am-fork-pointJohn Keeping2014-07-161-3/+4
* | | Merge branch 'rr/rebase-autostash-fix'Junio C Hamano2014-06-161-1/+10
|\ \ \ | | |/ | |/|
| * | rebase -i: handle "Nothing to do" case with autostashRamkumar Ramachandra2014-05-191-1/+10
* | | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-06-031-4/+4
|\ \ \ | |_|/ |/| |
| * | git-rebase.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-4/+4
* | | Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano2014-04-211-10/+1
|\ \ \
| * | | Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"km/avoid-non-function-return-in-rebaseKyle J. McKay2014-04-171-10/+1
* | | | Merge branch 'bg/rebase-off-of-previous-branch'Junio C Hamano2014-03-281-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | rebase: allow "-" short-hand for the previous branchBrian Gesiak2014-03-191-0/+4
| |/ /
* | | rebase: add the --gpg-sign optionNicolas Vigier2014-02-111-0/+11
* | | rebase: parse options in stuck-long modeNicolas Vigier2014-02-111-28/+22
* | | rebase: don't try to match -M optionNicolas Vigier2014-02-031-1/+1
* | | rebase: remove useless arguments checkNicolas Vigier2014-02-031-2/+0
* | | git-sh-setup.sh: add variable to use the stuck-long modeNicolas Vigier2014-02-031-0/+1
|/ /
* | rebase: fix fork-point with zero argumentsJohn Keeping2014-01-091-1/+2
* | rebase: use reflog to find common base with upstreamJohn Keeping2013-12-101-0/+19
* | Merge branch 'mm/rebase-continue-freebsd-WB'Junio C Hamano2013-09-201-1/+10
|\ \
| * | rebase: fix run_specific_rebase's use of "return" on FreeBSDmm/rebase-continue-freebsd-WBMatthieu Moy2013-09-091-1/+10
* | | Merge branch 'rr/rebase-autostash'Junio C Hamano2013-07-311-1/+1
|\ \ \ | | |/ | |/|
| * | git-rebase: fix typorr/rebase-autostashRalf Thielow2013-07-291-1/+1
* | | Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano2013-07-181-2/+6
|\ \ \
| * | | rebase: use a better reflog messageRamkumar Ramachandra2013-06-231-2/+6
* | | | Merge branch 'rr/rebase-stash-store'Junio C Hamano2013-06-271-5/+2
|\ \ \ \
| * | | | rebase: use 'git stash store' to simplify logicRamkumar Ramachandra2013-06-171-5/+2
* | | | | Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano2013-06-241-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | rebase: use peel_committish() where appropriateRamkumar Ramachandra2013-06-141-2/+2
| |/ / /
* | | | rebase: finish_rebase() in noop rebaseRamkumar Ramachandra2013-06-131-0/+1
* | | | rebase: finish_rebase() in fast-forward rebaseRamkumar Ramachandra2013-06-131-0/+1
* | | | rebase: guard against missing files in read_basic_state()Ramkumar Ramachandra2013-06-131-0/+2
|/ / /
View Lorry Controller Status