summaryrefslogtreecommitdiffstats
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorLines
2012-09-17rebase -i: Teach "--edit-todo" actionAndrew Wong-2/+11
2012-09-17rebase usage: subcommands can not be combined with -iMartin von Zweigbergk-1/+1
2012-08-01git-rebase.sh: fix typo in an error messageRalf Thielow-1/+1
2012-07-26rebase: remove obsolete and unused LONG_USAGE which breaks xgettextJiang Xin-25/+0
2012-07-26i18n: Rewrite gettext messages start with dashJiang Xin-1/+1
2012-07-25i18n: rebase: mark messages for translationJiang Xin-30/+34
2012-07-15Merge branch 'cw/rebase-i-root'Junio C Hamano-2/+12
2012-07-13Merge branch 'mz/rebase-no-mbox'Junio C Hamano-1/+5
2012-06-26rebase -i: support --root without --ontoChris Webb-2/+12
2012-06-26rebase --root: print usage on too many argsMartin von Zweigbergk-1/+5
2012-06-13rebase -i: teach "--exec <cmd>"Lucien Kong-3/+17
2012-06-01Merge branch 'ef/maint-rebase-error-message'Junio C Hamano-1/+1
2012-05-30rebase: report invalid commit correctlyErik Faye-Lund-1/+1
2012-05-29Do not autosquash in case of an implied interactive rebaseVincent van Ravesteijn-0/+1
2012-04-24git-rebase: add keep_empty flagNeil Horman-0/+5
2012-03-04Make git-{pull,rebase} message without tracking information friendlierCarlos Martín Nieto-1/+1
2011-10-17Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano-1/+1
2011-10-13pull,rebase: handle GIT_WORK_TREE betterJeff King-1/+1
2011-08-05misc-sh: fix up whitespace in some other .sh files.Jon Seymour-1/+1
2011-07-22Merge branch 'mz/doc-rebase-abort'Junio C Hamano-5/+5
2011-07-13rebase: clarify "restore the original branch"Martin von Zweigbergk-5/+5
2011-07-13Merge branch 'js/rebase-typo-branch-squelch-usage'Junio C Hamano-2/+1
2011-06-29rebase: do not print lots of usage hints after an obvious error messageJohannes Sixt-2/+1
2011-05-27rebase: write a reflog entry when finishingJeff King-1/+3
2011-05-27rebase: create HEAD reflog entry when abortingCsaba Henk-1/+1
2011-03-04rebase: define options in OPTIONS_SPECMartin von Zweigbergk-45/+56
2011-02-10rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk-6/+15
2011-02-10rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk-0/+4
2011-02-10rebase: remember strategy and strategy optionsMartin von Zweigbergk-0/+6
2011-02-10rebase: remember verbose optionMartin von Zweigbergk-2/+4
2011-02-10rebase: extract code for writing basic stateMartin von Zweigbergk-3/+13
2011-02-10rebase: factor out sub command handlingMartin von Zweigbergk-2/+15
2011-02-10rebase: make -v a tiny bit more verboseMartin von Zweigbergk-2/+16
2011-02-10rebase: extract am code to new source fileMartin von Zweigbergk-29/+2
2011-02-10rebase: extract merge code to new source fileMartin von Zweigbergk-151/+11
2011-02-10rebase: remove $branch as synonym for $orig_headMartin von Zweigbergk-10/+9
2011-02-10rebase: factor out reference parsingMartin von Zweigbergk-4/+5
2011-02-10rebase -i: support --statMartin von Zweigbergk-7/+7
2011-02-10rebase: reorder validation stepsMartin von Zweigbergk-5/+5
2011-02-10rebase: factor out call to pre-rebase hookMartin von Zweigbergk-5/+7
2011-02-10rebase: factor out clean work tree checkMartin von Zweigbergk-2/+2
2011-02-10rebase: factor out command line option processingMartin von Zweigbergk-20/+38
2011-02-10rebase: align variable contentMartin von Zweigbergk-1/+3
2011-02-10rebase: align variable namesMartin von Zweigbergk-16/+16
2011-02-10rebase: stricter check of standalone sub commandMartin von Zweigbergk-2/+2
2011-02-10rebase: act on command line outside parsing loopMartin von Zweigbergk-60/+66
2011-02-10rebase: improve detection of rebase in progressMartin von Zweigbergk-39/+41
2011-02-10rebase: remove unused rebase state 'prev_head'Martin von Zweigbergk-8/+0
2011-02-10rebase: read state outside loopMartin von Zweigbergk-2/+2
2011-02-10rebase: refactor reading of stateMartin von Zweigbergk-30/+23