summaryrefslogtreecommitdiff
path: root/git-rebase.sh
AgeCommit message (Expand)Author
2013-09-20Merge branch 'mm/rebase-continue-freebsd-WB'Junio C Hamano
2013-09-09rebase: fix run_specific_rebase's use of "return" on FreeBSDMatthieu Moy
2013-07-31Merge branch 'rr/rebase-autostash'Junio C Hamano
2013-07-29git-rebase: fix typoRalf Thielow
2013-07-18Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano
2013-06-27Merge branch 'rr/rebase-stash-store'Junio C Hamano
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano
2013-06-24rebase: use a better reflog messageRamkumar Ramachandra
2013-06-17rebase: use 'git stash store' to simplify logicRamkumar Ramachandra
2013-06-14rebase: use peel_committish() where appropriateRamkumar Ramachandra
2013-06-13rebase: finish_rebase() in noop rebaseRamkumar Ramachandra
2013-06-13rebase: finish_rebase() in fast-forward rebaseRamkumar Ramachandra
2013-06-13rebase: guard against missing files in read_basic_state()Ramkumar Ramachandra
2013-05-29rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra
2013-05-13rebase: prepare to do generic housekeepingRamkumar Ramachandra
2013-04-26Merge branch 'ph/rebase-original'Junio C Hamano
2013-04-23rebase: find orig_head unambiguouslyPhil Hord
2012-09-18rebase -i: Teach "--edit-todo" actionAndrew Wong
2012-09-18rebase usage: subcommands can not be combined with -iMartin von Zweigbergk
2012-08-01git-rebase.sh: fix typo in an error messageRalf Thielow
2012-07-27rebase: remove obsolete and unused LONG_USAGE which breaks xgettextJiang Xin
2012-07-27i18n: Rewrite gettext messages start with dashJiang Xin
2012-07-25i18n: rebase: mark messages for translationJiang Xin
2012-07-16Merge branch 'cw/rebase-i-root'Junio C Hamano
2012-07-13Merge branch 'mz/rebase-no-mbox'Junio C Hamano
2012-06-26rebase -i: support --root without --ontoChris Webb
2012-06-26rebase --root: print usage on too many argsMartin von Zweigbergk
2012-06-13rebase -i: teach "--exec <cmd>"Lucien Kong
2012-06-01Merge branch 'ef/maint-rebase-error-message'Junio C Hamano
2012-05-30rebase: report invalid commit correctlyErik Faye-Lund
2012-05-29Do not autosquash in case of an implied interactive rebaseVincent van Ravesteijn
2012-04-24git-rebase: add keep_empty flagNeil Horman
2012-03-05Make git-{pull,rebase} message without tracking information friendlierCarlos Martín Nieto
2011-10-18Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano
2011-10-13pull,rebase: handle GIT_WORK_TREE betterJeff King
2011-08-05misc-sh: fix up whitespace in some other .sh files.Jon Seymour
2011-07-22Merge branch 'mz/doc-rebase-abort'Junio C Hamano
2011-07-14rebase: clarify "restore the original branch"Martin von Zweigbergk
2011-07-13Merge branch 'js/rebase-typo-branch-squelch-usage'Junio C Hamano
2011-06-29rebase: do not print lots of usage hints after an obvious error messageJohannes Sixt
2011-05-27rebase: write a reflog entry when finishingJeff King
2011-05-27rebase: create HEAD reflog entry when abortingCsaba Henk
2011-03-05rebase: define options in OPTIONS_SPECMartin von Zweigbergk
2011-02-10rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk
2011-02-10rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk
2011-02-10rebase: remember strategy and strategy optionsMartin von Zweigbergk
2011-02-10rebase: remember verbose optionMartin von Zweigbergk
2011-02-10rebase: extract code for writing basic stateMartin von Zweigbergk
2011-02-10rebase: factor out sub command handlingMartin von Zweigbergk
2011-02-10rebase: make -v a tiny bit more verboseMartin von Zweigbergk