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