| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'ep/avoid-test-a-o' | Junio C Hamano | 2014-06-25 | 1 | -1/+1 |
|\ |
|
| * | git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -1/+1 |
* | | Merge branch 'rr/rebase-autostash-fix' | Junio C Hamano | 2014-06-16 | 1 | -2/+2 |
|\ \
| |/
|/| |
|
| * | rebase -i: handle "Nothing to do" case with autostash | Ramkumar Ramachandra | 2014-05-19 | 1 | -2/+2 |
* | | Merge branch 'km/avoid-non-function-return-in-rebase' | Junio C Hamano | 2014-04-21 | 1 | -0/+15 |
|\ \ |
|
| * | | rebase: avoid non-function use of "return" on FreeBSD | Kyle J. McKay | 2014-04-17 | 1 | -0/+15 |
* | | | Merge branch 'us/printf-not-echo' | Junio C Hamano | 2014-03-25 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | rebase -i: do not "echo" random user-supplied strings | Uwe Storbeck | 2014-03-17 | 1 | -1/+1 |
* | | | rebase: add the --gpg-sign option | Nicolas Vigier | 2014-02-11 | 1 | -13/+26 |
|/ / |
|
* | | remove #!interpreter line from shell librariesjn/scripts-updates | Jonathan Nieder | 2013-11-26 | 1 | -6/+3 |
* | | rebase -i: respect core.abbrev | Kirill A. Shutemov | 2013-09-30 | 1 | -1/+1 |
* | | Merge branch 'es/rebase-i-no-abbrev' | Junio C Hamano | 2013-09-11 | 1 | -0/+30 |
|\ \ |
|
| * | | rebase -i: fix short SHA-1 collisiones/rebase-i-no-abbrev | Junio C Hamano | 2013-08-25 | 1 | -0/+30 |
* | | | Merge branch 'rt/rebase-p-no-merge-summary' | Junio C Hamano | 2013-09-11 | 1 | -1/+2 |
|\ \ \ |
|
| * | | | rebase --preserve-merges: ignore "merge.log" configrt/rebase-p-no-merge-summary | Ralf Thielow | 2013-08-21 | 1 | -1/+2 |
| |/ / |
|
* | | | Merge branch 'es/rebase-i-respect-core-commentchar' | Junio C Hamano | 2013-09-11 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | rebase -i: fix cases ignoring core.commentchares/rebase-i-respect-core-commentchar | Eric Sunshine | 2013-08-18 | 1 | -1/+1 |
* | | | Merge branch 'rr/rebase-reflog-message-reword' | Junio C Hamano | 2013-07-18 | 1 | -1/+5 |
|\ \ \ |
|
| * | | | rebase -i: use a better reflog message | Ramkumar Ramachandra | 2013-06-23 | 1 | -1/+5 |
| |/ / |
|
* | | | Merge branch 'af/rebase-i-merge-options' | Junio C Hamano | 2013-07-11 | 1 | -5/+16 |
|\ \ \ |
|
| * | | | Do not ignore merge options in interactive rebaseaf/rebase-i-merge-options | Arnaud Fontaine | 2013-07-02 | 1 | -5/+16 |
| | |/
| |/| |
|
* | | | rebase -i: handle fixup! fixup! in --autosquash | Andrew Pimlott | 2013-06-27 | 1 | -5/+20 |
|/ / |
|
* | | rebase -i: return control to caller, for housekeeping | Ramkumar Ramachandra | 2013-05-12 | 1 | -4/+5 |
* | | rebase -i: don't error out if $state_dir already exists | Ramkumar Ramachandra | 2013-05-12 | 1 | -1/+1 |
|/ |
|
* | bash-prompt.sh: show where rebase is at when stopped | Zoltan Klinger | 2013-04-25 | 1 | -0/+5 |
* | Merge branch 'jk/rebase-i-comment-char' | Junio C Hamano | 2013-02-17 | 1 | -40/+44 |
|\ |
|
| * | rebase -i: respect core.commentchar | John Keeping | 2013-02-12 | 1 | -40/+44 |
* | | Merge branch 'ph/rebase-preserve-all-merges' | Junio C Hamano | 2013-01-21 | 1 | -1/+6 |
|\ \
| |/
|/| |
|
| * | rebase --preserve-merges: keep all merge commits including empty ones | Phil Hord | 2013-01-14 | 1 | -1/+6 |
* | | Merge branch 'aw/rebase-i-edit-todo' | Junio C Hamano | 2012-09-29 | 1 | -13/+40 |
|\ \ |
|
| * | | rebase -i: suggest using --edit-todo to fix an unknown instruction | Johannes Sixt | 2012-09-19 | 1 | -2/+3 |
| * | | rebase -i: Teach "--edit-todo" action | Andrew Wong | 2012-09-17 | 1 | -0/+17 |
| * | | rebase -i: Refactor help messages for todo file | Andrew Wong | 2012-09-17 | 1 | -11/+20 |
| * | | Merge branch 'mg/rebase-i-onto-reflog-in-full' | Junio C Hamano | 2012-08-29 | 1 | -2/+1 |
| |\ \ |
|
* | | | | rebase -i: fix misleading error message after 'exec no-such' instruction | Johannes Sixt | 2012-09-18 | 1 | -0/+4 |
* | | | | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-09-10 | 1 | -2/+1 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 1 | -2/+1 |
| |\ \ \
| | |/ /
| | | /
| | |/
| |/| |
|
| | * | rebase -i: use full onto sha1 in reflog | Michael J Gruber | 2012-08-10 | 1 | -2/+1 |
| | * | Merge branch 'nl/rebase-i-cheat-sheet' into maint | Junio C Hamano | 2012-05-10 | 1 | -0/+2 |
| | |\ |
|
* | | \ | Merge branch 'cw/rebase-i-root' | Junio C Hamano | 2012-07-25 | 1 | -12/+13 |
|\ \ \ \ |
|
| * | | | | rebase -i: handle fixup of root commit correctly | Chris Webb | 2012-07-24 | 1 | -12/+13 |
* | | | | | Merge branch 'cw/rebase-i-root' | Junio C Hamano | 2012-07-15 | 1 | -6/+26 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | rebase -i: support --root without --onto | Chris Webb | 2012-06-26 | 1 | -6/+26 |
| |/ / / |
|
* | | | | Merge branch 'mz/rebase-no-mbox' | Junio C Hamano | 2012-07-13 | 1 | -3/+1 |
|\ \ \ \ |
|
| * | | | | rebase: don't source git-sh-setup twice | Martin von Zweigbergk | 2012-06-26 | 1 | -3/+1 |
| |/ / / |
|
* | | | | rebase -i: teach "--exec <cmd>" | Lucien Kong | 2012-06-13 | 1 | -0/+23 |
|/ / / |
|
* | | | Merge branch 'nh/empty-rebase' | Junio C Hamano | 2012-04-30 | 1 | -3/+32 |
|\ \ \ |
|
| * | | | git-rebase: add keep_empty flag | Neil Horman | 2012-04-24 | 1 | -3/+32 |
* | | | | Merge branch 'jk/rebase-i-submodule-conflict-only' | Junio C Hamano | 2012-04-23 | 1 | -1/+1 |
|\ \ \ \
| | |/ /
| |/| /
| |_|/
|/| | |
|
| * | | rebase -i continue: don't skip commits that only change submodules | John Keeping | 2012-04-09 | 1 | -1/+1 |