summaryrefslogtreecommitdiff
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
2010-10-28Porcelain scripts: Rewrite cryptic "needs update" error messageLibravatar Ramkumar Ramachandra1-13/+1
2010-10-13shell portability: no "export VAR=VAL"Libravatar Junio C Hamano1-1/+1
2010-09-15Merge branch 'os/fix-rebase-diff-no-prefix'Libravatar Junio C Hamano1-0/+1
2010-09-09Add --src/dst-prefix to git-formt-patch in git-rebase.shLibravatar Oded Shimon1-0/+1
2010-08-20Merge branch 'jn/rebase-rename-am' into maintLibravatar Junio C Hamano1-1/+1
2010-08-18Merge branch 'ml/rebase-x-strategy'Libravatar Junio C Hamano1-1/+23
2010-08-18Merge branch 'jn/rebase-rename-am'Libravatar Junio C Hamano1-1/+1
2010-08-09git-rebase: fix typo when parsing --force-rebaseLibravatar Willy Tarreau1-1/+1
2010-08-03rebase: support -X to pass through strategy optionsLibravatar Mike Lundy1-1/+23
2010-07-28Fix git rebase --continue to work with touched filesLibravatar David D. Kilzer1-0/+1
2010-07-23rebase: protect against diff.renames configurationLibravatar Junio C Hamano1-1/+1
2010-05-31rebase: improve error message when upstream argument is missingLibravatar Jonathan Nieder1-9/+8
2010-04-03Merge branch 'mb/rebase-i-no-ff'Libravatar Junio C Hamano1-2/+2
2010-03-24Merge branch 'tr/notes-display'Libravatar Junio C Hamano1-0/+6
2010-03-24Teach rebase the --no-ff option.Libravatar Marc Branchaud1-2/+2
2010-03-12rebase: support automatic notes copyingLibravatar Thomas Rast1-0/+1
2010-03-12rebase: invoke post-rewrite hookLibravatar Thomas Rast1-0/+5
2010-01-30rebase: don't invoke the pager for each commit summaryLibravatar Markus Heidelberg1-1/+1
2010-01-25rebase: replace antiquated sed invocationLibravatar Stephen Boyd1-4/+2
2010-01-18Merge branch 'jc/rerere'Libravatar Junio C Hamano1-1/+5
2010-01-13Merge branch 'jc/checkout-merge-base'Libravatar Junio C Hamano1-1/+23
2010-01-07rebase: fix --onto A...B parsing and add testsLibravatar Nanako Shiraishi1-14/+19
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsLibravatar Junio C Hamano1-1/+5
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Libravatar Junio C Hamano1-1/+1
2009-11-23Protect scripted Porcelains from GREP_OPTIONS insanityLibravatar Junio C Hamano1-1/+1
2009-11-21"rebase --onto A...B" replays history on the merge base between A and BLibravatar Junio C Hamano1-1/+18
2009-10-24Use 'fast-forward' all over the placeLibravatar Felipe Contreras1-1/+1
2009-09-11rebase: use plumbing to show dirty stateLibravatar Jeff King1-1/+1
2009-08-21Merge branch 'gb/apply-ignore-whitespace'Libravatar Junio C Hamano1-0/+3
2009-08-06rebase: consistent error messages for staged and unstaged changes.Libravatar Matthieu Moy1-2/+4
2009-08-05git apply: option to ignore whitespace differencesLibravatar Giuseppe Bilotta1-0/+3
2009-07-01Merge branch 'sb/quiet-porcelains'Libravatar Junio C Hamano1-10/+38
2009-06-18am, rebase: teach quiet optionLibravatar Stephen Boyd1-10/+38
2009-06-14pull, rebase: simplify to use die()Libravatar Stephen Boyd1-6/+3
2009-03-27rebase: fix typo (force_rebas -> force-rebas)Libravatar Michele Ballabio1-1/+1
2009-03-18rebase: add options passed to git-amLibravatar Michele Ballabio1-0/+4
2009-03-11Merge branch 'tv/rebase-stat'Libravatar Junio C Hamano1-7/+18
2009-03-05Merge branch 'sr/force-rebase'Libravatar Junio C Hamano1-5/+19
2009-03-02git-rebase: Add --stat and --no-stat for producing diffstat on rebaseLibravatar Tor Arne Vestbø1-7/+18
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