| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'maint' | Junio C Hamano | 2011-01-27 | 1 | -1/+2 |
|\ |
|
| * | rebase: give a better error message for bogus branch | Jeff King | 2011-01-26 | 1 | -0/+1 |
| * | rebase: use explicit "--" with checkout | Jeff King | 2011-01-26 | 1 | -1/+1 |
| * | Merge branch 'mz/rebase-abort-reflog-fix' into maint | Junio C Hamano | 2010-12-14 | 1 | -9/+10 |
| |\ |
|
| * \ | Merge branch 'mz/maint-rebase-stat-config' into maint | Junio C Hamano | 2010-12-14 | 1 | -1/+2 |
| |\ \ |
|
* | \ \ | Merge branch 'mz/rebase-i-verify' | Junio C Hamano | 2010-12-12 | 1 | -0/+3 |
|\ \ \ \ |
|
| * | | | | rebase: support --verify | Martin von Zweigbergk | 2010-11-23 | 1 | -0/+3 |
| |/ / / |
|
* | | | | Merge branch 'mz/rebase-abort-reflog-fix' | Junio C Hamano | 2010-12-12 | 1 | -9/+10 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | rebase --abort: do not update branch ref | Martin von Zweigbergk | 2010-11-23 | 1 | -9/+10 |
| |/ / |
|
* | | | Merge branch 'mz/maint-rebase-stat-config' | Junio C Hamano | 2010-12-12 | 1 | -1/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | rebase: only show stat if configured to true | Martin von Zweigbergk | 2010-11-29 | 1 | -1/+2 |
* | | | Merge branch 'rr/needs-clean-work-tree' | Junio C Hamano | 2010-11-29 | 1 | -13/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | Porcelain scripts: Rewrite cryptic "needs update" error message | Ramkumar Ramachandra | 2010-10-28 | 1 | -13/+1 |
* | | | rebase -X: do not clobber strategy | Martin von Zweigbergk | 2010-11-10 | 1 | -4/+0 |
|/ / |
|
* | | shell portability: no "export VAR=VAL" | Junio C Hamano | 2010-10-13 | 1 | -1/+1 |
* | | Merge branch 'os/fix-rebase-diff-no-prefix' | Junio C Hamano | 2010-09-15 | 1 | -0/+1 |
|\ \ |
|
| * | | Add --src/dst-prefix to git-formt-patch in git-rebase.sh | Oded Shimon | 2010-09-09 | 1 | -0/+1 |
| * | | Merge branch 'jn/rebase-rename-am' into maint | Junio C Hamano | 2010-08-20 | 1 | -1/+1 |
| |\ \ |
|
* | \ \ | 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 |
|\ |
|