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