summaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAgeFilesLines
* rebase: start implementing it as a builtinPratik Karki2018-08-061-773/+0
* Merge branch 'en/rebase-consistency'Junio C Hamano2018-07-241-4/+39
|\
| * git-rebase: make --allow-empty-message the defaultElijah Newren2018-06-271-1/+1
| * git-rebase: error out when incompatible options passedElijah Newren2018-06-271-0/+35
| * git-rebase.sh: update help messages a bitElijah Newren2018-06-261-3/+3
* | Merge branch 'en/rebase-i-microfixes'Junio C Hamano2018-07-181-1/+1
|\ \
| * | Fix use of strategy options with interactive rebasesElijah Newren2018-06-271-1/+1
* | | rebase: use the new git-rebase--preserve-merges.shAlban Gruin2018-06-011-7/+25
| |/ |/|
* | rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin2018-04-261-1/+11
* | rebase: introduce the --rebase-merges optionJohannes Schindelin2018-04-261-0/+6
* | Merge branch 'pw/rebase-signoff'Junio C Hamano2018-04-251-1/+26
|\ \
| * | rebase --keep-empty: always use interactive rebasepw/rebase-signoffPhillip Wood2018-03-291-0/+5
| * | rebase -p: error out if --signoff is givenPhillip Wood2018-03-291-0/+2
| * | rebase: extend --signoff supportPhillip Wood2018-03-291-1/+19
* | | Merge branch 'pw/rebase-keep-empty-fixes'Junio C Hamano2018-04-251-0/+4
|\ \ \ | |/ /
| * | rebase: respect --no-keep-emptypw/rebase-keep-empty-fixesPhillip Wood2018-03-291-0/+3
| * | rebase --root: stop assuming squash_onto is unsetPhillip Wood2018-03-201-0/+1
* | | rebase: add and use git_rebase__interactive__preserve_mergesWink Saville2018-03-231-1/+1
* | | rebase: update invocation of rebase dot-sourced scriptsWink Saville2018-03-231-0/+1
| |/ |/|
* | Merge branch 'nd/rebase-show-current-patch'Junio C Hamano2018-03-061-1/+7
|\ \
| * | rebase: introduce and use pseudo-ref REBASE_HEADnd/rebase-show-current-patchNguyễn Thái Ngọc Duy2018-02-121-0/+1
| * | rebase: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-121-1/+6
| |/
* | rebase: add --allow-empty-message optiongs/rebase-allow-empty-messageGenki Sky2018-02-071-0/+5
|/
* rebase: rebasing can also be done when HEAD is detachedks/rebase-error-messagesKaartic Sivaraam2017-12-191-2/+14
* rebase: distinguish user input by quoting itKaartic Sivaraam2017-12-191-2/+2
* rebase: consistently use branch_name variableKaartic Sivaraam2017-12-191-7/+10
* Merge branch 'ks/rebase-no-git-foo'Junio C Hamano2017-11-271-2/+2
|\
| * git-rebase: clean up dashed-usages in messagesks/rebase-no-git-fooKaartic Sivaraam2017-11-211-2/+2
| * Merge branch 'pw/rebase-i-regression-fix-tests' into maintJunio C Hamano2017-07-101-2/+2
| |\
* | \ Merge branch 'tz/redirect-fix'Junio C Hamano2017-11-271-1/+1
|\ \ \
| * | | rebase: fix stderr redirect in apply_autostash()tz/redirect-fixTodd Zullinger2017-11-141-1/+1
* | | | Merge branch 'bc/rev-parse-parseopt-fix'Junio C Hamano2017-10-031-0/+3
|\ \ \ \
| * | | | git-rebase: don't ignore unexpected command line argumentsBrandon Casey2017-09-191-0/+3
| |/ / /
* | | | Merge branch 'kw/rebase-progress'Junio C Hamano2017-08-231-0/+6
|\ \ \ \
| * | | | rebase: turn on progress option by default for format-patchkw/rebase-progressKevin Willford2017-08-141-0/+6
| |/ / /
* | | | rebase: make resolve message clearer for inexperienced userswd/rebase-conflict-guideWilliam Duclot2017-07-171-3/+4
|/ / /
* | | 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
|\ \ \
View Lorry Controller Status