summaryrefslogtreecommitdiff
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
2011-07-22Merge branch 'mz/doc-rebase-abort'Libravatar Junio C Hamano1-5/+5
2011-07-13rebase: clarify "restore the original branch"Libravatar Martin von Zweigbergk1-5/+5
2011-07-13Merge branch 'js/rebase-typo-branch-squelch-usage'Libravatar Junio C Hamano1-2/+1
2011-06-29rebase: do not print lots of usage hints after an obvious error messageLibravatar Johannes Sixt1-2/+1
2011-05-27rebase: write a reflog entry when finishingLibravatar Jeff King1-1/+3
2011-05-27rebase: create HEAD reflog entry when abortingLibravatar Csaba Henk1-1/+1
2011-03-04rebase: define options in OPTIONS_SPECLibravatar Martin von Zweigbergk1-45/+56
2011-02-10rebase: use @{upstream} if no upstream specifiedLibravatar Martin von Zweigbergk1-6/+15
2011-02-10rebase -m: remember allow_rerere_autoupdate optionLibravatar Martin von Zweigbergk1-0/+4
2011-02-10rebase: remember strategy and strategy optionsLibravatar Martin von Zweigbergk1-0/+6
2011-02-10rebase: remember verbose optionLibravatar Martin von Zweigbergk1-2/+4
2011-02-10rebase: extract code for writing basic stateLibravatar Martin von Zweigbergk1-3/+13
2011-02-10rebase: factor out sub command handlingLibravatar Martin von Zweigbergk1-2/+15
2011-02-10rebase: make -v a tiny bit more verboseLibravatar Martin von Zweigbergk1-2/+16
2011-02-10rebase: extract am code to new source fileLibravatar Martin von Zweigbergk1-29/+2
2011-02-10rebase: extract merge code to new source fileLibravatar Martin von Zweigbergk1-151/+11
2011-02-10rebase: remove $branch as synonym for $orig_headLibravatar Martin von Zweigbergk1-10/+9
2011-02-10rebase -i: support --statLibravatar Martin von Zweigbergk1-7/+7
2011-02-10rebase: factor out call to pre-rebase hookLibravatar Martin von Zweigbergk1-5/+7
2011-02-10rebase: factor out clean work tree checkLibravatar Martin von Zweigbergk1-2/+2
2011-02-10rebase: factor out reference parsingLibravatar Martin von Zweigbergk1-4/+5
2011-02-10rebase: reorder validation stepsLibravatar Martin von Zweigbergk1-5/+5
2011-02-10rebase: factor out command line option processingLibravatar Martin von Zweigbergk1-20/+38
2011-02-10rebase: align variable contentLibravatar Martin von Zweigbergk1-1/+3
2011-02-10rebase: align variable namesLibravatar Martin von Zweigbergk1-16/+16
2011-02-10rebase: stricter check of standalone sub commandLibravatar Martin von Zweigbergk1-2/+2
2011-02-10rebase: act on command line outside parsing loopLibravatar Martin von Zweigbergk1-60/+66
2011-02-10rebase: improve detection of rebase in progressLibravatar Martin von Zweigbergk1-39/+41
2011-02-10rebase: remove unused rebase state 'prev_head'Libravatar Martin von Zweigbergk1-8/+0
2011-02-10rebase: read state outside loopLibravatar Martin von Zweigbergk1-2/+2
2011-02-10rebase: refactor reading of stateLibravatar Martin von Zweigbergk1-30/+23
2011-02-10rebase: clearer names for directory variablesLibravatar Martin von Zweigbergk1-70/+71
2011-01-27Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2011-01-26rebase: give a better error message for bogus branchLibravatar Jeff King1-0/+1
2011-01-26rebase: use explicit "--" with checkoutLibravatar Jeff King1-1/+1
2010-12-14Merge branch 'mz/rebase-abort-reflog-fix' into maintLibravatar Junio C Hamano1-9/+10
2010-12-14Merge branch 'mz/maint-rebase-stat-config' into maintLibravatar Junio C Hamano1-1/+2
2010-12-12Merge branch 'mz/rebase-i-verify'Libravatar Junio C Hamano1-0/+3
2010-12-12Merge branch 'mz/rebase-abort-reflog-fix'Libravatar Junio C Hamano1-9/+10
2010-12-12Merge branch 'mz/maint-rebase-stat-config'Libravatar Junio C Hamano1-1/+2
2010-11-29Merge branch 'rr/needs-clean-work-tree'Libravatar Junio C Hamano1-13/+1
2010-11-29rebase: only show stat if configured to trueLibravatar Martin von Zweigbergk1-1/+2
2010-11-23rebase --abort: do not update branch refLibravatar Martin von Zweigbergk1-9/+10
2010-11-23rebase: support --verifyLibravatar Martin von Zweigbergk1-0/+3
2010-11-10rebase -X: do not clobber strategyLibravatar Martin von Zweigbergk1-4/+0
2010-10-28Porcelain scripts: Rewrite cryptic "needs update" error messageLibravatar Ramkumar Ramachandra1-13/+1
2010-10-13shell portability: no "export VAR=VAL"Libravatar Junio C Hamano1-1/+1
2010-09-15Merge branch 'os/fix-rebase-diff-no-prefix'Libravatar Junio C Hamano1-0/+1
2010-09-09Add --src/dst-prefix to git-formt-patch in git-rebase.shLibravatar Oded Shimon1-0/+1
2010-08-20Merge branch 'jn/rebase-rename-am' into maintLibravatar Junio C Hamano1-1/+1