summaryrefslogtreecommitdiff
path: root/git-rebase.sh
AgeCommit message (Expand)Author
2014-07-16rebase: omit patch-identical commits with --fork-pointJohn Keeping
2014-06-16Merge branch 'rr/rebase-autostash-fix'Junio C Hamano
2014-06-03Merge branch 'ep/shell-command-substitution'Junio C Hamano
2014-05-19rebase -i: handle "Nothing to do" case with autostashRamkumar Ramachandra
2014-04-23git-rebase.sh: use the $( ... ) construct for command substitutionElia Pinto
2014-04-21Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano
2014-04-17Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"Kyle J. McKay
2014-03-28Merge branch 'bg/rebase-off-of-previous-branch'Junio C Hamano
2014-03-19rebase: allow "-" short-hand for the previous branchBrian Gesiak
2014-02-11rebase: add the --gpg-sign optionNicolas Vigier
2014-02-11rebase: parse options in stuck-long modeNicolas Vigier
2014-02-03rebase: don't try to match -M optionNicolas Vigier
2014-02-03rebase: remove useless arguments checkNicolas Vigier
2014-02-03git-sh-setup.sh: add variable to use the stuck-long modeNicolas Vigier
2014-01-09rebase: fix fork-point with zero argumentsJohn Keeping
2013-12-10rebase: use reflog to find common base with upstreamJohn Keeping
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