summaryrefslogtreecommitdiff
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
2013-07-18Merge branch 'rr/rebase-reflog-message-reword'Libravatar Junio C Hamano1-2/+6
2013-06-27Merge branch 'rr/rebase-stash-store'Libravatar Junio C Hamano1-5/+2
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Libravatar Junio C Hamano1-2/+2
2013-06-23rebase: use a better reflog messageLibravatar Ramkumar Ramachandra1-2/+6
2013-06-17rebase: use 'git stash store' to simplify logicLibravatar Ramkumar Ramachandra1-5/+2
2013-06-14rebase: use peel_committish() where appropriateLibravatar Ramkumar Ramachandra1-2/+2
2013-06-13rebase: finish_rebase() in noop rebaseLibravatar Ramkumar Ramachandra1-0/+1
2013-06-13rebase: finish_rebase() in fast-forward rebaseLibravatar Ramkumar Ramachandra1-0/+1
2013-06-13rebase: guard against missing files in read_basic_state()Libravatar Ramkumar Ramachandra1-0/+2
2013-05-29rebase: implement --[no-]autostash and rebase.autostashLibravatar Ramkumar Ramachandra1-3/+42
2013-05-12rebase: prepare to do generic housekeepingLibravatar Ramkumar Ramachandra1-0/+7
2013-04-26Merge branch 'ph/rebase-original'Libravatar Junio C Hamano1-1/+1
2013-04-23rebase: find orig_head unambiguouslyLibravatar Phil Hord1-1/+1
2012-09-17rebase -i: Teach "--edit-todo" actionLibravatar Andrew Wong1-2/+11
2012-09-17rebase usage: subcommands can not be combined with -iLibravatar Martin von Zweigbergk1-1/+1
2012-08-01git-rebase.sh: fix typo in an error messageLibravatar Ralf Thielow1-1/+1
2012-07-26rebase: remove obsolete and unused LONG_USAGE which breaks xgettextLibravatar Jiang Xin1-25/+0
2012-07-26i18n: Rewrite gettext messages start with dashLibravatar Jiang Xin1-1/+1
2012-07-25i18n: rebase: mark messages for translationLibravatar Jiang Xin1-30/+34
2012-07-15Merge branch 'cw/rebase-i-root'Libravatar Junio C Hamano1-2/+12
2012-07-13Merge branch 'mz/rebase-no-mbox'Libravatar Junio C Hamano1-1/+5
2012-06-26rebase -i: support --root without --ontoLibravatar Chris Webb1-2/+12
2012-06-26rebase --root: print usage on too many argsLibravatar Martin von Zweigbergk1-1/+5
2012-06-13rebase -i: teach "--exec <cmd>"Libravatar Lucien Kong1-3/+17
2012-06-01Merge branch 'ef/maint-rebase-error-message'Libravatar Junio C Hamano1-1/+1
2012-05-30rebase: report invalid commit correctlyLibravatar Erik Faye-Lund1-1/+1
2012-05-29Do not autosquash in case of an implied interactive rebaseLibravatar Vincent van Ravesteijn1-0/+1
2012-04-24git-rebase: add keep_empty flagLibravatar Neil Horman1-0/+5
2012-03-04Make git-{pull,rebase} message without tracking information friendlierLibravatar Carlos Martín Nieto1-1/+1
2011-10-17Merge branch 'jk/pull-rebase-with-work-tree'Libravatar Junio C Hamano1-1/+1
2011-10-13pull,rebase: handle GIT_WORK_TREE betterLibravatar Jeff King1-1/+1
2011-08-05misc-sh: fix up whitespace in some other .sh files.Libravatar Jon Seymour1-1/+1
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: factor out reference parsingLibravatar Martin von Zweigbergk1-4/+5