| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | Merge branch 'ml/rebase-x-strategy' | Junio C Hamano | 2010-08-18 | 1 | -1/+23 |
|\ \ \ \ |
|
| * | | | | rebase: support -X to pass through strategy options | Mike Lundy | 2010-08-03 | 1 | -1/+23 |
* | | | | | Merge branch 'jn/rebase-rename-am' | Junio C Hamano | 2010-08-18 | 1 | -1/+1 |
|\ \ \ \ \
| |_|/ / /
|/| | / /
| | |/ /
| |/| | |
|
| * | | | rebase: protect against diff.renames configuration | Junio C Hamano | 2010-07-23 | 1 | -1/+1 |
| |/ / |
|
* | | | git-rebase: fix typo when parsing --force-rebase | Willy Tarreau | 2010-08-09 | 1 | -1/+1 |
* | | | Fix git rebase --continue to work with touched files | David D. Kilzer | 2010-07-28 | 1 | -0/+1 |
|/ / |
|
* | | rebase: improve error message when upstream argument is missing | Jonathan Nieder | 2010-05-31 | 1 | -9/+8 |
* | | Merge branch 'mb/rebase-i-no-ff' | Junio C Hamano | 2010-04-03 | 1 | -2/+2 |
|\ \ |
|
| * | | Teach rebase the --no-ff option. | Marc Branchaud | 2010-03-24 | 1 | -2/+2 |
| |/ |
|
* | | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 | 1 | -0/+6 |
|\ \
| |/
|/| |
|
| * | rebase: support automatic notes copying | Thomas Rast | 2010-03-12 | 1 | -0/+1 |
| * | rebase: invoke post-rewrite hook | Thomas Rast | 2010-03-12 | 1 | -0/+5 |
* | | rebase: don't invoke the pager for each commit summary | Markus Heidelberg | 2010-01-30 | 1 | -1/+1 |
* | | rebase: replace antiquated sed invocation | Stephen Boyd | 2010-01-25 | 1 | -4/+2 |
|/ |
|
* | Merge branch 'jc/rerere' | Junio C Hamano | 2010-01-18 | 1 | -1/+5 |
|\ |
|
| * | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 2009-12-04 | 1 | -1/+5 |
* | | Merge branch 'jc/checkout-merge-base' | Junio C Hamano | 2010-01-13 | 1 | -1/+23 |
|\ \
| |/
|/| |
|
| * | rebase: fix --onto A...B parsing and add tests | Nanako Shiraishi | 2010-01-07 | 1 | -14/+19 |
| * | "rebase --onto A...B" replays history on the merge base between A and B | Junio C Hamano | 2009-11-21 | 1 | -1/+18 |
* | | Merge branch 'rs/work-around-grep-opt-insanity' | Junio C Hamano | 2009-11-25 | 1 | -1/+1 |
|\ \ |
|
| * | | Protect scripted Porcelains from GREP_OPTIONS insanity | Junio C Hamano | 2009-11-23 | 1 | -1/+1 |
| |/ |
|
* | | Use 'fast-forward' all over the place | Felipe Contreras | 2009-10-24 | 1 | -1/+1 |
|/ |
|
* | rebase: use plumbing to show dirty state | Jeff King | 2009-09-11 | 1 | -1/+1 |
* | Merge branch 'gb/apply-ignore-whitespace' | Junio C Hamano | 2009-08-21 | 1 | -0/+3 |
|\ |
|
| * | git apply: option to ignore whitespace differences | Giuseppe Bilotta | 2009-08-05 | 1 | -0/+3 |
* | | rebase: consistent error messages for staged and unstaged changes. | Matthieu Moy | 2009-08-06 | 1 | -2/+4 |
|/ |
|
* | Merge branch 'sb/quiet-porcelains' | Junio C Hamano | 2009-07-01 | 1 | -10/+38 |
|\ |
|
| * | am, rebase: teach quiet option | Stephen Boyd | 2009-06-18 | 1 | -10/+38 |
* | | pull, rebase: simplify to use die() | Stephen Boyd | 2009-06-14 | 1 | -6/+3 |
|/ |
|
* | rebase: fix typo (force_rebas -> force-rebas) | Michele Ballabio | 2009-03-27 | 1 | -1/+1 |
* | rebase: add options passed to git-am | Michele Ballabio | 2009-03-18 | 1 | -0/+4 |
* | Merge branch 'tv/rebase-stat' | Junio C Hamano | 2009-03-11 | 1 | -7/+18 |
|\ |
|
| * | git-rebase: Add --stat and --no-stat for producing diffstat on rebase | Tor Arne Vestbø | 2009-03-02 | 1 | -7/+18 |
* | | Merge branch 'sr/force-rebase' | Junio C Hamano | 2009-03-05 | 1 | -5/+19 |
|\ \
| |/
|/| |
|
| * | Teach rebase to rebase even if upstream is up to date | Sverre Rabbelier | 2009-02-13 | 1 | -5/+19 |
* | | disallow providing multiple upstream branches to rebase, pull --rebase | Jay Soffian | 2009-02-18 | 1 | -0/+1 |
|/ |
|
* | rebase: learn to rebase root commit | Thomas Rast | 2009-01-11 | 1 | -16/+40 |
* | rebase: improve error messages about dirty state | Jeff King | 2008-12-10 | 1 | -3/+6 |
* | rebase: use git rev-parse -q | Miklos Vajna | 2008-12-03 | 1 | -2/+2 |
* | Merge branch 'ae/preservemerge' | Junio C Hamano | 2008-10-19 | 1 | -3/+19 |
|\ |
|
| * | rebase: Support preserving merges in non-interactive mode | Andreas Ericsson | 2008-09-30 | 1 | -3/+19 |
* | | rebase --no-verify | Nanako Shiraishi | 2008-10-06 | 1 | -1/+6 |
* | | Teach rebase -i to honor pre-rebase hook | Nanako Shiraishi | 2008-10-06 | 1 | -7/+11 |
|/ |
|
* | Improve error output of git-rebase | Stephan Beyer | 2008-08-16 | 1 | -5/+16 |
* | Rename .git/rebase to .git/rebase-apply | Johannes Schindelin | 2008-07-21 | 1 | -23/+25 |
* | Merge branch 'rs/rebase-checkout-not-so-quiet' | Junio C Hamano | 2008-07-16 | 1 | -2/+1 |
|\ |
|
| * | git-rebase: report checkout failure | Junio C Hamano | 2008-07-14 | 1 | -3/+1 |
* | | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" | Johannes Schindelin | 2008-07-15 | 1 | -22/+22 |
* | | Teach "am" and "rebase" to mark the original position with ORIG_HEAD | Junio C Hamano | 2008-07-07 | 1 | -1/+1 |
|/ |
|
* | git-rebase.sh: Add check if rebase is in progress | Stephan Beyer | 2008-06-22 | 1 | -4/+10 |