| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | sequencer: fix edit handling for cherry-pick and revert messages | Elijah Newren | 2021-03-31 | 1 | -2/+4 |
| * | Merge branch 'en/merge-ort-api-null-impl' | Junio C Hamano | 2020-11-18 | 1 | -0/+1 |
| |\ |
|
| | * | merge,rebase,revert: select ort or recursive by config or environment | Elijah Newren | 2020-11-02 | 1 | -0/+1 |
| * | | Merge branch 'pw/rebase-i-orig-head' | Junio C Hamano | 2020-11-18 | 1 | -3/+4 |
| |\ \ |
|
| | * | | rebase -i: use struct object_id when writing state | Phillip Wood | 2020-11-04 | 1 | -1/+1 |
| | * | | rebase -i: use struct object_id rather than looking up commit | Phillip Wood | 2020-11-04 | 1 | -2/+3 |
| | |/ |
|
| * | | Merge branch 'jk/committer-date-is-author-date-fix-simplify' | Junio C Hamano | 2020-11-09 | 1 | -2/+0 |
| |\ \
| |/
|/| |
|
| | * | am, sequencer: stop parsing our own committer ident | Jeff King | 2020-10-26 | 1 | -2/+0 |
| * | | Merge branch 'pw/rebase-i-more-options' | Junio C Hamano | 2020-09-03 | 1 | -0/+4 |
| |\ \
| |/ |
|
| | * | rebase -i: support --ignore-date | Phillip Wood | 2020-08-19 | 1 | -0/+1 |
| | * | rebase -i: support --committer-date-is-author-date | Phillip Wood | 2020-08-17 | 1 | -0/+3 |
| * | | Merge branch 'dl/merge-autostash' | Junio C Hamano | 2020-04-29 | 1 | -0/+20 |
| |\ \ |
|
| | * | | sequencer: implement apply_autostash_oid() | Denton Liu | 2020-04-10 | 1 | -0/+1 |
| | * | | sequencer: implement save_autostash() | Denton Liu | 2020-04-10 | 1 | -0/+1 |
| | * | | sequencer: extract perform_autostash() from rebase | Denton Liu | 2020-04-10 | 1 | -0/+2 |
| | * | | rebase: use apply_autostash() from sequencer.c | Denton Liu | 2020-04-10 | 1 | -0/+2 |
| | * | | sequencer: make read_oneliner() extern | Denton Liu | 2020-04-07 | 1 | -0/+14 |
| * | | | Merge branch 'jt/rebase-allow-duplicate' | Junio C Hamano | 2020-04-22 | 1 | -1/+1 |
| |\ \ \ |
|
| | * | | | rebase --merge: optionally skip upstreamed commits | Jonathan Tan | 2020-04-11 | 1 | -1/+1 |
| * | | | | Merge branch 'en/rebase-no-keep-empty' | Junio C Hamano | 2020-04-22 | 1 | -1/+1 |
| |\ \ \ \
| |/ / /
| | | /
| |_|/
|/| | |
|
| | * | | rebase: reinstate --no-keep-empty | Elijah Newren | 2020-04-11 | 1 | -1/+1 |
| | |/ |
|
| * | | Merge branch 'pw/advise-rebase-skip' | Junio C Hamano | 2020-03-25 | 1 | -1/+2 |
| |\ \
| |/
|/| |
|
| | * | commit: encapsulate determine_whence() for sequencer | Phillip Wood | 2019-12-06 | 1 | -1/+2 |
| * | | Merge branch 'en/rebase-backend' | Junio C Hamano | 2020-03-02 | 1 | -1/+2 |
| |\ \ |
|
| | * | | rebase (interactive-backend): fix handling of commits that become empty | Elijah Newren | 2020-02-16 | 1 | -0/+1 |
| | * | | rebase (interactive-backend): make --keep-empty the default | Elijah Newren | 2020-02-16 | 1 | -1/+1 |
| * | | | Merge branch 'ag/edit-todo-drop-check' | Junio C Hamano | 2020-02-14 | 1 | -1/+1 |
| |\ \ \ |
|
| | * | | | rebase-interactive: warn if commit is dropped with `rebase --edit-todo' | Alban Gruin | 2020-01-28 | 1 | -0/+1 |
| | * | | | sequencer: move check_todo_list_from_file() to rebase-interactive.c | Alban Gruin | 2020-01-28 | 1 | -1/+0 |
| | |/ / |
|
| * | | | Merge branch 'ag/rebase-avoid-unneeded-checkout' | Junio C Hamano | 2020-02-14 | 1 | -3/+0 |
| |\ \ \
| |/ /
|/| | |
|
| | * | | rebase -i: stop checking out the tip of the branch to rebase | Alban Gruin | 2020-01-24 | 1 | -3/+0 |
| * | | | Revert "Merge branch 'ra/rebase-i-more-options'" | Junio C Hamano | 2020-01-12 | 1 | -2/+0 |
| * | | | Merge branch 'ra/rebase-i-more-options' | Junio C Hamano | 2019-12-10 | 1 | -0/+2 |
| |\ \ \
| |_|/
|/| | |
|
| | * | | rebase -i: support --ignore-date | Rohit Ashiwal | 2019-11-02 | 1 | -0/+1 |
| | * | | rebase -i: support --committer-date-is-author-date | Rohit Ashiwal | 2019-11-02 | 1 | -0/+1 |
| * | | | Merge branch 'pw/post-commit-from-sequencer' | Junio C Hamano | 2019-11-10 | 1 | -2/+1 |
| |\ \ \ |
|
| | * | | | sequencer.h fix placement of #endif | Phillip Wood | 2019-10-16 | 1 | -2/+1 |
| | |/ / |
|
| * | | | Merge branch 'js/rebase-r-strategy' | Junio C Hamano | 2019-09-18 | 1 | -0/+6 |
| |\ \ \
| |_|/
|/| | |
|
| | * | | rebase -r: do not (re-)generate root commits with `--root` *and* `--onto` | Johannes Schindelin | 2019-07-31 | 1 | -0/+6 |
| | |/ |
|
| * | | Merge branch 'ra/cherry-pick-revert-skip' | Junio C Hamano | 2019-07-19 | 1 | -0/+1 |
| |\ \ |
|
| | * | | cherry-pick/revert: add --skip option | Rohit Ashiwal | 2019-07-02 | 1 | -0/+1 |
| | |/ |
|
| * | | Merge branch 'nd/switch-and-restore' | Junio C Hamano | 2019-07-09 | 1 | -1/+1 |
| |\ \
| |/
|/| |
|
| * | | Merge branch 'pw/clean-sequencer-state-upon-final-commit' | Junio C Hamano | 2019-05-13 | 1 | -0/+3 |
| |\ \ |
|
| | * | | fix cherry-pick/revert status after commit | Phillip Wood | 2019-04-17 | 1 | -0/+2 |
| | * | | commit/reset: try to clean up sequencer state | Phillip Wood | 2019-04-17 | 1 | -0/+1 |
| | |/ |
|
| * | | Merge branch 'pw/rebase-i-internal' | Junio C Hamano | 2019-05-13 | 1 | -3/+4 |
| |\ \ |
|
| | * | | rebase -i: use struct commit when parsing options | Phillip Wood | 2019-04-19 | 1 | -2/+2 |
| | * | | sequencer: always discard index after checkout | Phillip Wood | 2019-04-19 | 1 | -1/+2 |
| | * | | Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal | Junio C Hamano | 2019-04-19 | 1 | -17/+64 |
| | |\ \
| | |/
| |/| |
|
| * | | | Merge branch 'dl/merge-cleanup-scissors-fix' | Junio C Hamano | 2019-05-09 | 1 | -1/+8 |
| |\ \ \ |
|
