summaryrefslogtreecommitdiffstats
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorLines
2010-05-31rebase: improve error message when upstream argument is missingJonathan Nieder-9/+8
2010-04-03Merge branch 'mb/rebase-i-no-ff'Junio C Hamano-2/+2
2010-03-24Merge branch 'tr/notes-display'Junio C Hamano-0/+6
2010-03-24Teach rebase the --no-ff option.Marc Branchaud-2/+2
2010-03-12rebase: support automatic notes copyingThomas Rast-0/+1
2010-03-12rebase: invoke post-rewrite hookThomas Rast-0/+5
2010-01-30rebase: don't invoke the pager for each commit summaryMarkus Heidelberg-1/+1
2010-01-25rebase: replace antiquated sed invocationStephen Boyd-4/+2
2010-01-18Merge branch 'jc/rerere'Junio C Hamano-1/+5
2010-01-13Merge branch 'jc/checkout-merge-base'Junio C Hamano-1/+23
2010-01-07rebase: fix --onto A...B parsing and add testsNanako Shiraishi-14/+19
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano-1/+5
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano-1/+1
2009-11-23Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano-1/+1
2009-11-21"rebase --onto A...B" replays history on the merge base between A and BJunio C Hamano-1/+18
2009-10-24Use 'fast-forward' all over the placeFelipe Contreras-1/+1
2009-09-11rebase: use plumbing to show dirty stateJeff King-1/+1
2009-08-21Merge branch 'gb/apply-ignore-whitespace'Junio C Hamano-0/+3
2009-08-06rebase: consistent error messages for staged and unstaged changes.Matthieu Moy-2/+4
2009-08-05git apply: option to ignore whitespace differencesGiuseppe Bilotta-0/+3
2009-07-01Merge branch 'sb/quiet-porcelains'Junio C Hamano-10/+38
2009-06-18am, rebase: teach quiet optionStephen Boyd-10/+38
2009-06-14pull, rebase: simplify to use die()Stephen Boyd-6/+3
2009-03-27rebase: fix typo (force_rebas -> force-rebas)Michele Ballabio-1/+1
2009-03-18rebase: add options passed to git-amMichele Ballabio-0/+4
2009-03-11Merge branch 'tv/rebase-stat'Junio C Hamano-7/+18
2009-03-05Merge branch 'sr/force-rebase'Junio C Hamano-5/+19
2009-03-02git-rebase: Add --stat and --no-stat for producing diffstat on rebaseTor Arne Vestbø-7/+18
2009-02-18disallow providing multiple upstream branches to rebase, pull --rebaseJay Soffian-0/+1
2009-02-13Teach rebase to rebase even if upstream is up to dateSverre Rabbelier-5/+19
2009-01-11rebase: learn to rebase root commitThomas Rast-16/+40
2008-12-10rebase: improve error messages about dirty stateJeff King-3/+6
2008-12-03rebase: use git rev-parse -qMiklos Vajna-2/+2
2008-10-19Merge branch 'ae/preservemerge'Junio C Hamano-3/+19
2008-10-06rebase --no-verifyNanako Shiraishi-1/+6
2008-10-06Teach rebase -i to honor pre-rebase hookNanako Shiraishi-7/+11
2008-09-30rebase: Support preserving merges in non-interactive modeAndreas Ericsson-3/+19
2008-08-16Improve error output of git-rebaseStephan Beyer-5/+16
2008-07-21Rename .git/rebase to .git/rebase-applyJohannes Schindelin-23/+25
2008-07-16Merge branch 'rs/rebase-checkout-not-so-quiet'Junio C Hamano-2/+1
2008-07-15Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin-22/+22
2008-07-14git-rebase: report checkout failureJunio C Hamano-3/+1
2008-07-07Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano-1/+1
2008-06-22git-rebase.sh: Add check if rebase is in progressStephan Beyer-4/+10
2008-05-15Ignore dirty submodule states during rebase and stashJohannes Schindelin-4/+4
2008-05-14Merge branch 'bd/tests'Junio C Hamano-1/+1
2008-05-13fix bsd shell negationJeff King-1/+1
2008-05-05git-rebase.sh: Fix --merge --abort failures when path contains whitespaceBryan Donlan-1/+1
2008-03-16rebase [--onto O] A B: omit needless checkoutJunio C Hamano-20/+32
2008-03-16Merge branch 'maint'Junio C Hamano-1/+1