summaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAgeFilesLines
* 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
* rebase: clearer names for directory variablesMartin von Zweigbergk2011-02-101-70/+71
* Merge branch 'maint'Junio C Hamano2011-01-271-1/+2
|\
| * rebase: give a better error message for bogus branchJeff King2011-01-261-0/+1
| * rebase: use explicit "--" with checkoutJeff King2011-01-261-1/+1
| * Merge branch 'mz/rebase-abort-reflog-fix' into maintJunio C Hamano2010-12-141-9/+10
| |\
| * \ Merge branch 'mz/maint-rebase-stat-config' into maintJunio C Hamano2010-12-141-1/+2
| |\ \
* | \ \ Merge branch 'mz/rebase-i-verify'Junio C Hamano2010-12-121-0/+3
|\ \ \ \
| * | | | rebase: support --verifyMartin von Zweigbergk2010-11-231-0/+3
| |/ / /
* | | | Merge branch 'mz/rebase-abort-reflog-fix'Junio C Hamano2010-12-121-9/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | rebase --abort: do not update branch refMartin von Zweigbergk2010-11-231-9/+10
| |/ /
* | | Merge branch 'mz/maint-rebase-stat-config'Junio C Hamano2010-12-121-1/+2
|\ \ \ | | |/ | |/|
| * | rebase: only show stat if configured to trueMartin von Zweigbergk2010-11-291-1/+2
* | | Merge branch 'rr/needs-clean-work-tree'Junio C Hamano2010-11-291-13/+1
|\ \ \ | |_|/ |/| |
| * | Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra2010-10-281-13/+1
* | | rebase -X: do not clobber strategyMartin von Zweigbergk2010-11-101-4/+0
|/ /
* | shell portability: no "export VAR=VAL"Junio C Hamano2010-10-131-1/+1
* | Merge branch 'os/fix-rebase-diff-no-prefix'Junio C Hamano2010-09-151-0/+1
|\ \
| * | Add --src/dst-prefix to git-formt-patch in git-rebase.shOded Shimon2010-09-091-0/+1