aboutsummaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAge
* Merge branch 'ml/rebase-x-strategy'Junio C Hamano2010-08-18
|\
| * rebase: support -X to pass through strategy optionsMike Lundy2010-08-03
* | Merge branch 'jn/rebase-rename-am'Junio C Hamano2010-08-18
|\ \
| * | rebase: protect against diff.renames configurationJunio C Hamano2010-07-23
| |/
* | git-rebase: fix typo when parsing --force-rebaseWilly Tarreau2010-08-09
* | Fix git rebase --continue to work with touched filesDavid D. Kilzer2010-07-28
|/
* rebase: improve error message when upstream argument is missingJonathan Nieder2010-05-31
* Merge branch 'mb/rebase-i-no-ff'Junio C Hamano2010-04-03
|\
| * Teach rebase the --no-ff option.Marc Branchaud2010-03-24
* | Merge branch 'tr/notes-display'Junio C Hamano2010-03-24
|\ \ | |/ |/|
| * rebase: support automatic notes copyingThomas Rast2010-03-12
| * rebase: invoke post-rewrite hookThomas Rast2010-03-12
* | rebase: don't invoke the pager for each commit summaryMarkus Heidelberg2010-01-30
* | rebase: replace antiquated sed invocationStephen Boyd2010-01-25
|/
* Merge branch 'jc/rerere'Junio C Hamano2010-01-18
|\
| * Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-04
* | Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-13
|\ \ | |/ |/|
| * rebase: fix --onto A...B parsing and add testsNanako Shiraishi2010-01-07
| * "rebase --onto A...B" replays history on the merge base between A and BJunio C Hamano2009-11-21
* | Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano2009-11-25
|\ \
| * | Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano2009-11-23
| |/
* | Use 'fast-forward' all over the placeFelipe Contreras2009-10-24
|/
* rebase: use plumbing to show dirty stateJeff King2009-09-11
* Merge branch 'gb/apply-ignore-whitespace'Junio C Hamano2009-08-21
|\
| * git apply: option to ignore whitespace differencesGiuseppe Bilotta2009-08-05
* | rebase: consistent error messages for staged and unstaged changes.Matthieu Moy2009-08-06
|/
* Merge branch 'sb/quiet-porcelains'Junio C Hamano2009-07-01
|\
| * am, rebase: teach quiet optionStephen Boyd2009-06-18
* | pull, rebase: simplify to use die()Stephen Boyd2009-06-14
|/
* rebase: fix typo (force_rebas -> force-rebas)Michele Ballabio2009-03-27
* rebase: add options passed to git-amMichele Ballabio2009-03-18
* Merge branch 'tv/rebase-stat'Junio C Hamano2009-03-11
|\
| * git-rebase: Add --stat and --no-stat for producing diffstat on rebaseTor Arne Vestbø2009-03-02
* | Merge branch 'sr/force-rebase'Junio C Hamano2009-03-05
|\ \ | |/ |/|
| * Teach rebase to rebase even if upstream is up to dateSverre Rabbelier2009-02-13
* | disallow providing multiple upstream branches to rebase, pull --rebaseJay Soffian2009-02-18
|/
* rebase: learn to rebase root commitThomas Rast2009-01-11
* rebase: improve error messages about dirty stateJeff King2008-12-10
* rebase: use git rev-parse -qMiklos Vajna2008-12-03
* Merge branch 'ae/preservemerge'Junio C Hamano2008-10-19
|\
| * rebase: Support preserving merges in non-interactive modeAndreas Ericsson2008-09-30
* | rebase --no-verifyNanako Shiraishi2008-10-06
* | Teach rebase -i to honor pre-rebase hookNanako Shiraishi2008-10-06
|/
* Improve error output of git-rebaseStephan Beyer2008-08-16
* Rename .git/rebase to .git/rebase-applyJohannes Schindelin2008-07-21
* Merge branch 'rs/rebase-checkout-not-so-quiet'Junio C Hamano2008-07-16
|\
| * git-rebase: report checkout failureJunio C Hamano2008-07-14
* | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-15
* | Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano2008-07-07
|/
* git-rebase.sh: Add check if rebase is in progressStephan Beyer2008-06-22