| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| * | rebase -i: Use symbolic constant $MSG consistently | Michael Haggerty | 2010-01-14 | 1 | -4/+4 |
| * | rebase -i: Use "test -n" instead of "test ! -z" | Michael Haggerty | 2010-01-14 | 1 | -1/+1 |
| * | rebase -i: Inline expression | Michael Haggerty | 2010-01-14 | 1 | -2/+1 |
| * | rebase -i: Remove dead code | Michael Haggerty | 2010-01-14 | 1 | -1/+0 |
| * | rebase -i: Make the condition for an "if" more transparent | Michael Haggerty | 2010-01-14 | 1 | -1/+2 |
* | | Merge branch 'ns/rebase-auto-squash' | Junio C Hamano | 2010-01-20 | 1 | -0/+37 |
|\ \ |
|
| * | | rebase -i --autosquash: auto-squash commits | Nanako Shiraishi | 2010-01-06 | 1 | -0/+37 |
* | | | Merge branch 'mh/rebase-fixup' (early part) | Junio C Hamano | 2010-01-20 | 1 | -10/+35 |
|\ \ \
| | |/
| |/| |
|
| * | | rebase-i: Ignore comments and blank lines in peek_next_command | Michael Haggerty | 2010-01-12 | 1 | -1/+1 |
| |/ |
|
| * | Add a command "fixup" to rebase --interactive | Michael Haggerty | 2009-12-07 | 1 | -10/+35 |
* | | Merge branch 'jc/checkout-merge-base' | Junio C Hamano | 2010-01-13 | 1 | -1/+20 |
|\ \ |
|
| * | | rebase -i: teach --onto A...B syntax | Nanako Shiraishi | 2010-01-07 | 1 | -1/+20 |
* | | | rebase--interactive: Ignore comments and blank lines in peek_next_command | Michael Haggerty | 2010-01-11 | 1 | -1/+1 |
* | | | Merge branch 'maint' | Junio C Hamano | 2009-12-19 | 1 | -1/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | rebase -i: abort cleanly if the editor fails to launch | Björn Gustavsson | 2009-12-19 | 1 | -1/+1 |
| * | | Merge branch 'rs/work-around-grep-opt-insanity' into maint | Junio C Hamano | 2009-12-03 | 1 | -5/+5 |
| |\ \ |
|
* | \ \ | Merge branch 'rs/work-around-grep-opt-insanity' | Junio C Hamano | 2009-11-25 | 1 | -5/+5 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Protect scripted Porcelains from GREP_OPTIONS insanity | Junio C Hamano | 2009-11-23 | 1 | -5/+5 |
| | |/
| |/| |
|
* | | | Merge branch 'fc/doc-fast-forward' | Junio C Hamano | 2009-11-15 | 1 | -3/+3 |
|\ \ \ |
|
| * | | | Use 'fast-forward' all over the place | Felipe Contreras | 2009-10-24 | 1 | -3/+3 |
| |/ / |
|
* | | | Merge branch 'maint' | Junio C Hamano | 2009-10-28 | 1 | -1/+6 |
|\ \ \
| | |/
| |/| |
|
| * | | rebase -i: more graceful handling of invalid commands | Jan Krüger | 2009-10-27 | 1 | -1/+6 |
| |/ |
|
* | | rebase -i: fix reword when using a terminal editor | Stephen Boyd | 2009-10-19 | 1 | -1/+1 |
* | | Teach 'rebase -i' the command "reword" | Björn Gustavsson | 2009-10-07 | 1 | -0/+9 |
|/ |
|
* | Fix rebase -p --onto | Greg Price | 2009-07-22 | 1 | -1/+1 |
* | Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maint | Junio C Hamano | 2009-06-11 | 1 | -1/+1 |
|\ |
|
| * | rebase--interactive: remote stray closing parenthesis | Uwe Kleine-König | 2009-06-11 | 1 | -1/+1 |
* | | rebase -i: avoid 'git reset' when possible | Johannes Schindelin | 2009-03-03 | 1 | -0/+26 |
* | | Merge branch 'js/maint-rebase-i-submodule' | Junio C Hamano | 2009-01-31 | 1 | -5/+4 |
|\ \ |
|
| * | | Fix submodule squashing into unrelated commit | Johannes Schindelin | 2009-01-28 | 1 | -5/+4 |
* | | | rebase -i: correctly remember --root flag across --continue | Junio C Hamano | 2009-01-26 | 1 | -2/+8 |
* | | | rebase -i --root: fix check for number of arguments | Johannes Schindelin | 2009-01-25 | 1 | -1/+2 |
* | | | Merge branch 'tr/rebase-root' | Junio C Hamano | 2009-01-17 | 1 | -31/+79 |
|\ \ \
| |/ /
|/| | |
|
| * | | rebase -i: learn to rebase root commit | Thomas Rast | 2009-01-11 | 1 | -31/+78 |