aboutsummaryrefslogtreecommitdiffstats
path: root/git-rebase.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2008-10-06Teach rebase -i to honor pre-rebase hookNanako Shiraishi1-7/+11
2008-09-30rebase: Support preserving merges in non-interactive modeAndreas Ericsson1-3/+19
2008-08-16Improve error output of git-rebaseStephan Beyer1-5/+16
2008-07-21Rename .git/rebase to .git/rebase-applyJohannes Schindelin1-23/+25
2008-07-16Merge branch 'rs/rebase-checkout-not-so-quiet'Junio C Hamano1-2/+1
2008-07-15Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin1-22/+22
2008-07-14git-rebase: report checkout failureJunio C Hamano1-3/+1
2008-07-07Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano1-1/+1
2008-06-22git-rebase.sh: Add check if rebase is in progressStephan Beyer1-4/+10
2008-05-15Ignore dirty submodule states during rebase and stashJohannes Schindelin1-4/+4
2008-05-14Merge branch 'bd/tests'Junio C Hamano1-1/+1
2008-05-13fix bsd shell negationJeff King1-1/+1
2008-05-05git-rebase.sh: Fix --merge --abort failures when path contains whitespaceBryan Donlan1-1/+1
2008-03-16rebase [--onto O] A B: omit needless checkoutJunio C Hamano1-20/+32
2008-03-16Merge branch 'maint'Junio C Hamano1-1/+1
2008-03-16rebase -m: do not trigger pre-commit verificationJunio C Hamano1-1/+1
2008-03-11git rebase --abort: always restore the right commitMike Hommey1-3/+2
2008-03-10update 'git rebase' documentationSZEDER Gábor1-2/+1
2008-03-05am: --rebasingJunio C Hamano1-1/+1
2008-03-01git rebase --abort: always restore the right commitMike Hommey1-3/+2
2007-11-28Merge branch 'maint'Junio C Hamano1-2/+2
2007-11-28scripts: do not get confused with HEAD in work treeJunio C Hamano1-2/+2
2007-11-24Merge branch 'mh/rebase-skip-hard'Junio C Hamano1-0/+1
2007-11-17Merge branch 'ph/parseopt-sh'Junio C Hamano1-0/+1
2007-11-12rebase: fix "rebase --continue" breakageJohannes Schindelin1-1/+5
2007-11-11Do git reset --hard HEAD when using git rebase --skipMike Hommey1-0/+1
2007-11-09rebase: operate on a detached HEADJohannes Schindelin1-5/+51
2007-11-06scripts: Add placeholders for OPTIONS_SPECJunio C Hamano1-0/+1
2007-11-02Fixing path quoting in git-rebaseJonathan del Strother1-13/+13
2007-10-18Fixing path quoting in git-rebaseJonathan del Strother1-13/+13
2007-09-23Merge branch 'maint'Junio C Hamano1-3/+2
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup1-3/+2
2007-09-07git-rebase: fix -C optionJ. Bruce Fields1-1/+0
2007-09-07git-rebase: support --whitespace=<option>J. Bruce Fields1-1/+4
2007-09-01Avoid one-or-more (\+) non BRE in sed scripts.Junio C Hamano1-4/+1
2007-09-01rebase -m: Fix incorrect short-logs of already applied commits.Johannes Sixt1-5/+8
2007-07-06Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin1-9/+3
2007-07-04Allow rebase to run if upstream is completely mergedJohannes Sixt1-3/+5
2007-07-02Rewrite "git-frotz" to "git frotz"Junio C Hamano1-19/+19
2007-06-24Teach rebase an interactive modeJohannes Schindelin1-1/+11
2007-06-02git-rebase: suggest to use git-add instead of git-update-indexJonas Fonseca1-2/+2
2007-05-10Add colour support in rebase and merge tree diff stats output.James Bowes1-1/+2
2007-04-13Use rev-list --reverse in git-rebase.shAlex Riesen1-2/+1
2007-03-24Use diff* with --exit-code in git-am, git-rebase and git-merge-oursAlex Riesen1-6/+4
2007-03-22git-rebase: make 'rebase HEAD branch' work as expected.Junio C Hamano1-4/+4
2007-02-08add -C[NUM] to git-amMichael S. Tsirkin1-1/+6
2007-01-31Improved error message from git-rebaseDavid Kågedal1-1/+2
2007-01-20git-rebase: allow rebasing a detached HEAD.Junio C Hamano1-2/+6
2007-01-12Allow whole-tree operations to be started from a subdirectoryJunio C Hamano1-0/+3
2007-01-10Disallow working directory commands in a bare repository.Shawn O. Pearce1-0/+1