| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'maint' | Junio C Hamano | 2011-01-27 | 1 | -2/+2 |
|\ |
|
| * | rebase -i: clarify in-editor documentation of "exec"ko-maint | Jonathan Nieder | 2011-01-27 | 1 | -1/+1 |
| * | rebase: use explicit "--" with checkout | Jeff King | 2011-01-26 | 1 | -1/+1 |
* | | Merge branch 'mz/rebase-i-verify' | Junio C Hamano | 2010-12-12 | 1 | -0/+2 |
|\ \ |
|
| * | | rebase: support --verify | Martin von Zweigbergk | 2010-11-23 | 1 | -0/+2 |
| |/ |
|
* | | Merge branch 'rr/needs-clean-work-tree' | Junio C Hamano | 2010-11-29 | 1 | -11/+3 |
|\ \ |
|
| * | | Porcelain scripts: Rewrite cryptic "needs update" error message | Ramkumar Ramachandra | 2010-10-28 | 1 | -11/+3 |
| |/ |
|
* | | rebase: teach --autosquash to match on sha1 in addition to message | Kevin Ballard | 2010-11-09 | 1 | -7/+33 |
* | | rebase: better rearranging of fixup!/squash! lines with --autosquash | Kevin Ballard | 2010-11-09 | 1 | -0/+4 |
|/ |
|
* | git-rebase--interactive.sh: replace cut with ${v%% *} | Chris Johnsen | 2010-09-17 | 1 | -1/+1 |
* | Merge branch 'jn/cherry-revert-message-clean-up' | Junio C Hamano | 2010-08-31 | 1 | -3/+3 |
|\ |
|
| * | cherry-pick/revert: Use advise() for hints | Jonathan Nieder | 2010-08-15 | 1 | -3/+3 |
* | | Merge branch 'hv/autosquash-config' | Junio C Hamano | 2010-08-31 | 1 | -0/+4 |
|\ \ |
|
| * | | add configuration variable for --autosquash option of interactive rebase | Heiko Voigt | 2010-07-14 | 1 | -0/+4 |
* | | | Merge branch 'mm/rebase-i-exec' | Junio C Hamano | 2010-08-21 | 1 | -6/+43 |
|\ \ \ |
|
| * | | | git-rebase--interactive.sh: use printf instead of echo to print commit message | Brandon Casey | 2010-08-13 | 1 | -2/+2 |
| * | | | git-rebase--interactive.sh: rework skip_unnecessary_picks | Brandon Casey | 2010-08-13 | 1 | -9/+14 |
| * | | | rebase -i: add exec command to launch a shell command | Matthieu Moy | 2010-08-11 | 1 | -3/+35 |
| | |/
| |/| |
|
* | | | git-rebase--interactive.sh: use printf instead of echo to print commit message | Brandon Casey | 2010-07-25 | 1 | -6/+6 |
|/ / |
|
* | | rebase-i: do not get fooled by a log message ending with backslash | Junio C Hamano | 2010-07-05 | 1 | -5/+5 |
* | | rebase-i: style fix | Junio C Hamano | 2010-07-05 | 1 | -5/+6 |
|/ |
|
* | rebase -i: Abort cleanly if new base cannot be checked out | Ian Ward Comfort | 2010-06-11 | 1 | -1/+2 |
* | rebase-interactive: silence warning when no commits rewritten | Jeff King | 2010-04-18 | 1 | -0/+1 |
* | Merge branch 'mb/rebase-i-no-ff' | Junio C Hamano | 2010-04-03 | 1 | -1/+7 |
|\ |
|
| * | Teach rebase the --no-ff option. | Marc Branchaud | 2010-03-24 | 1 | -2/+7 |
* | | Merge branch 'do/rebase-i-arbitrary' | Junio C Hamano | 2010-04-03 | 1 | -2/+0 |
|\ \ |
|
| * | | rebase--interactive: don't require what's rebased to be a branch | Dave Olszewski | 2010-03-14 | 1 | -2/+0 |
| |/ |
|
* | | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 2010-03-28 | 1 | -12/+3 |
|\ \ |
|
| * | | rebase -i: use new --ff cherry-pick option | Christian Couder | 2010-03-20 | 1 | -12/+3 |
| |/ |
|
* | | rebase -i: make post-rewrite work for 'edit' | Thomas Rast | 2010-03-28 | 1 | -2/+3 |
* | | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 | 1 | -2/+50 |
|\ \
| |/
|/| |
|
| * | rebase: support automatic notes copying | Thomas Rast | 2010-03-12 | 1 | -0/+4 |
| * | rebase -i: invoke post-rewrite hook | Thomas Rast | 2010-03-12 | 1 | -1/+45 |
| * | commit --amend: invoke post-rewrite hook | Thomas Rast | 2010-03-12 | 1 | -1/+1 |
* | | work around an obnoxious bash "safety feature" on OpenBSD | Junio C Hamano | 2010-01-26 | 1 | -3/+3 |
* | | fix portability issues with $ in double quotes | Stephen Boyd | 2010-01-26 | 1 | -1/+1 |
* | | rebase -i: Export GIT_AUTHOR_* variables explicitly | Junio C Hamano | 2010-01-23 | 1 | -4/+4 |
|/ |
|
* | rebase -i: Avoid non-portable "test X -a Y" | Michael Haggerty | 2010-01-22 | 1 | -1/+1 |
* | Merge branch 'mh/rebase-fixup' | Junio C Hamano | 2010-01-20 | 1 | -81/+143 |
|\ |
|
| * | rebase -i: Retain user-edited commit messages after squash/fixup conflicts | Michael Haggerty | 2010-01-14 | 1 | -39/+27 |
| * | rebase -i: For fixup commands without squashes, do not start editor | Michael Haggerty | 2010-01-14 | 1 | -27/+54 |
| * | rebase -i: Change function make_squash_message into update_squash_message | Michael Haggerty | 2010-01-14 | 1 | -15/+20 |
| * | rebase -i: Extract function do_with_author | Michael Haggerty | 2010-01-14 | 1 | -12/+15 |
| * | rebase -i: Handle the author script all in one place in do_next | Michael Haggerty | 2010-01-14 | 1 | -2/+2 |
| * | rebase -i: Extract a function "commit_message" | Michael Haggerty | 2010-01-14 | 1 | -5/+10 |
| * | rebase -i: Simplify commit counting for generated commit messages | Michael Haggerty | 2010-01-14 | 1 | -8/+3 |
| * | rebase -i: Improve consistency of commit count in generated commit messages | Michael Haggerty | 2010-01-14 | 1 | -1/+1 |
| * | rebase -i: Introduce a constant AMEND | Michael Haggerty | 2010-01-14 | 1 | -4/+12 |
| * | rebase -i: Introduce a constant AUTHOR_SCRIPT | Michael Haggerty | 2010-01-14 | 1 | -6/+11 |
| * | rebase -i: Document how temporary files are used | Michael Haggerty | 2010-01-14 | 1 | -7/+34 |