summaryrefslogtreecommitdiff
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
2009-03-05Merge branch 'sr/force-rebase'Libravatar Junio C Hamano1-5/+19
2009-02-18disallow providing multiple upstream branches to rebase, pull --rebaseLibravatar Jay Soffian1-0/+1
2009-02-13Teach rebase to rebase even if upstream is up to dateLibravatar Sverre Rabbelier1-5/+19
2009-01-11rebase: learn to rebase root commitLibravatar Thomas Rast1-16/+40
2008-12-10rebase: improve error messages about dirty stateLibravatar Jeff King1-3/+6
2008-12-03rebase: use git rev-parse -qLibravatar Miklos Vajna1-2/+2
2008-10-19Merge branch 'ae/preservemerge'Libravatar Junio C Hamano1-3/+19
2008-10-06rebase --no-verifyLibravatar Nanako Shiraishi1-1/+6
2008-10-06Teach rebase -i to honor pre-rebase hookLibravatar Nanako Shiraishi1-7/+11
2008-09-30rebase: Support preserving merges in non-interactive modeLibravatar Andreas Ericsson1-3/+19
2008-08-16Improve error output of git-rebaseLibravatar Stephan Beyer1-5/+16
2008-07-21Rename .git/rebase to .git/rebase-applyLibravatar Johannes Schindelin1-23/+25
2008-07-16Merge branch 'rs/rebase-checkout-not-so-quiet'Libravatar Junio C Hamano1-2/+1
2008-07-15Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Libravatar Johannes Schindelin1-22/+22
2008-07-14git-rebase: report checkout failureLibravatar Junio C Hamano1-3/+1
2008-07-07Teach "am" and "rebase" to mark the original position with ORIG_HEADLibravatar Junio C Hamano1-1/+1
2008-06-22git-rebase.sh: Add check if rebase is in progressLibravatar Stephan Beyer1-4/+10
2008-05-15Ignore dirty submodule states during rebase and stashLibravatar Johannes Schindelin1-4/+4
2008-05-14Merge branch 'bd/tests'Libravatar Junio C Hamano1-1/+1
2008-05-13fix bsd shell negationLibravatar Jeff King1-1/+1
2008-05-05git-rebase.sh: Fix --merge --abort failures when path contains whitespaceLibravatar Bryan Donlan1-1/+1
2008-03-16rebase [--onto O] A B: omit needless checkoutLibravatar Junio C Hamano1-20/+32
2008-03-16Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2008-03-16rebase -m: do not trigger pre-commit verificationLibravatar Junio C Hamano1-1/+1
2008-03-11git rebase --abort: always restore the right commitLibravatar Mike Hommey1-3/+2
2008-03-10update 'git rebase' documentationLibravatar SZEDER Gábor1-2/+1
2008-03-05am: --rebasingLibravatar Junio C Hamano1-1/+1
2008-03-01git rebase --abort: always restore the right commitLibravatar Mike Hommey1-3/+2
2007-11-28Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2007-11-28scripts: do not get confused with HEAD in work treeLibravatar Junio C Hamano1-2/+2
2007-11-24Merge branch 'mh/rebase-skip-hard'Libravatar Junio C Hamano1-0/+1
2007-11-17Merge branch 'ph/parseopt-sh'Libravatar Junio C Hamano1-0/+1
2007-11-12rebase: fix "rebase --continue" breakageLibravatar Johannes Schindelin1-1/+5
2007-11-11Do git reset --hard HEAD when using git rebase --skipLibravatar Mike Hommey1-0/+1
2007-11-09rebase: operate on a detached HEADLibravatar Johannes Schindelin1-5/+51
2007-11-06scripts: Add placeholders for OPTIONS_SPECLibravatar Junio C Hamano1-0/+1
2007-11-02Fixing path quoting in git-rebaseLibravatar Jonathan del Strother1-13/+13
2007-10-18Fixing path quoting in git-rebaseLibravatar Jonathan del Strother1-13/+13
2007-09-23Merge branch 'maint'Libravatar Junio C Hamano1-3/+2
2007-09-23Supplant the "while case ... break ;; esac" idiomLibravatar David Kastrup1-3/+2
2007-09-07git-rebase: fix -C optionLibravatar J. Bruce Fields1-1/+0
2007-09-07git-rebase: support --whitespace=<option>Libravatar J. Bruce Fields1-1/+4
2007-09-01Avoid one-or-more (\+) non BRE in sed scripts.Libravatar Junio C Hamano1-4/+1
2007-09-01rebase -m: Fix incorrect short-logs of already applied commits.Libravatar Johannes Sixt1-5/+8
2007-07-06Enable "git rerere" by the config variable rerere.enabledLibravatar Johannes Schindelin1-9/+3
2007-07-04Allow rebase to run if upstream is completely mergedLibravatar Johannes Sixt1-3/+5
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-19/+19
2007-06-24Teach rebase an interactive modeLibravatar Johannes Schindelin1-1/+11
2007-06-02git-rebase: suggest to use git-add instead of git-update-indexLibravatar Jonas Fonseca1-2/+2
2007-05-10Add colour support in rebase and merge tree diff stats output.Libravatar James Bowes1-1/+2