summaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAgeFilesLines
* rebase -i: Teach "--edit-todo" actionAndrew Wong2012-09-171-2/+11
* rebase usage: subcommands can not be combined with -iMartin von Zweigbergk2012-09-171-1/+1
* git-rebase.sh: fix typo in an error messageRalf Thielow2012-08-011-1/+1
* rebase: remove obsolete and unused LONG_USAGE which breaks xgettextJiang Xin2012-07-261-25/+0
* i18n: Rewrite gettext messages start with dashJiang Xin2012-07-261-1/+1
* i18n: rebase: mark messages for translationJiang Xin2012-07-251-30/+34
* Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-151-2/+12
|\
| * rebase -i: support --root without --ontoChris Webb2012-06-261-2/+12
* | Merge branch 'mz/rebase-no-mbox'Junio C Hamano2012-07-131-1/+5
|\ \
| * | rebase --root: print usage on too many argsMartin von Zweigbergk2012-06-261-1/+5
| |/
* | rebase -i: teach "--exec <cmd>"Lucien Kong2012-06-131-3/+17
|/
* Merge branch 'ef/maint-rebase-error-message'Junio C Hamano2012-06-011-1/+1
|\
| * rebase: report invalid commit correctlyErik Faye-Lund2012-05-301-1/+1
* | Do not autosquash in case of an implied interactive rebaseVincent van Ravesteijn2012-05-291-0/+1
* | git-rebase: add keep_empty flagNeil Horman2012-04-241-0/+5
* | Make git-{pull,rebase} message without tracking information friendliercn/pull-rebase-messageCarlos Martín Nieto2012-03-041-1/+1
* | Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano2011-10-171-1/+1
|\ \
| * | pull,rebase: handle GIT_WORK_TREE betterJeff King2011-10-131-1/+1
* | | misc-sh: fix up whitespace in some other .sh files.Jon Seymour2011-08-051-1/+1
* | | Merge branch 'mz/doc-rebase-abort'Junio C Hamano2011-07-221-5/+5
|\ \ \
| * | | rebase: clarify "restore the original branch"Martin von Zweigbergk2011-07-131-5/+5
* | | | Merge branch 'js/rebase-typo-branch-squelch-usage'Junio C Hamano2011-07-131-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | rebase: do not print lots of usage hints after an obvious error messageJohannes Sixt2011-06-291-2/+1
* | | | rebase: write a reflog entry when finishingJeff King2011-05-271-1/+3
* | | | rebase: create HEAD reflog entry when abortingCsaba Henk2011-05-271-1/+1
|/ / /
* | | rebase: define options in OPTIONS_SPECMartin von Zweigbergk2011-03-041-45/+56
* | | rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk2011-02-101-6/+15
* | | rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk2011-02-101-0/+4
* | | rebase: remember strategy and strategy optionsMartin von Zweigbergk2011-02-101-0/+6
* | | rebase: remember verbose optionMartin von Zweigbergk2011-02-101-2/+4
* | | rebase: extract code for writing basic stateMartin von Zweigbergk2011-02-101-3/+13
* | | rebase: factor out sub command handlingMartin von Zweigbergk2011-02-101-2/+15
* | | rebase: make -v a tiny bit more verboseMartin von Zweigbergk2011-02-101-2/+16
* | | rebase: extract am code to new source fileMartin von Zweigbergk2011-02-101-29/+2
* | | rebase: extract merge code to new source fileMartin von Zweigbergk2011-02-101-151/+11
* | | rebase: remove $branch as synonym for $orig_headMartin von Zweigbergk2011-02-101-10/+9
* | | rebase -i: support --statMartin von Zweigbergk2011-02-101-7/+7
* | | rebase: factor out call to pre-rebase hookMartin von Zweigbergk2011-02-101-5/+7
* | | rebase: factor out clean work tree checkMartin von Zweigbergk2011-02-101-2/+2
| |/ |/|
* | rebase: factor out reference parsingMartin von Zweigbergk2011-02-101-4/+5
* | rebase: reorder validation stepsMartin von Zweigbergk2011-02-101-5/+5
* | rebase: factor out command line option processingMartin von Zweigbergk2011-02-101-20/+38
* | rebase: align variable contentMartin von Zweigbergk2011-02-101-1/+3
* | rebase: align variable namesMartin von Zweigbergk2011-02-101-16/+16
* | rebase: stricter check of standalone sub commandMartin von Zweigbergk2011-02-101-2/+2
* | rebase: act on command line outside parsing loopMartin von Zweigbergk2011-02-101-60/+66
* | rebase: improve detection of rebase in progressMartin von Zweigbergk2011-02-101-39/+41
* | rebase: remove unused rebase state 'prev_head'Martin von Zweigbergk2011-02-101-8/+0
* | rebase: read state outside loopMartin von Zweigbergk2011-02-101-2/+2
* | rebase: refactor reading of stateMartin von Zweigbergk2011-02-101-30/+23