Age | Commit message (Expand) | Author | Files | Lines |
2020-02-24 | lib-log-graph: consolidate test_cmp_graph logic | Abhishek Kumar | 1 | -3/+2 |
2019-12-05 | Merge branch 'dl/t5520-cleanup' | Junio C Hamano | 1 | -1/+1 |
2019-12-05 | Merge branch 'dd/rebase-merge-reserves-onto-label' | Junio C Hamano | 1 | -0/+21 |
2019-12-05 | Merge branch 'js/rebase-r-safer-label' | Junio C Hamano | 1 | -0/+6 |
2019-11-21 | t: teach test_cmp_rev to accept ! for not-equals | Denton Liu | 1 | -1/+1 |
2019-11-20 | sequencer: handle rebase-merges for "onto" message | Doan Tran Cong Danh | 1 | -0/+21 |
2019-11-18 | rebase -r: let `label` generate safer labels | Matthew Rogers | 1 | -0/+6 |
2019-10-16 | graph: smooth appearance of collapsing edges on commit lines | James Coglan | 1 | -1/+1 |
2019-09-30 | Merge branch 'dl/use-sq-from-test-lib' | Junio C Hamano | 1 | -1/+0 |
2019-09-30 | Merge branch 'bc/hash-independent-tests-part-5' | Junio C Hamano | 1 | -8/+15 |
2019-09-18 | Merge branch 'js/rebase-r-strategy' | Junio C Hamano | 1 | -0/+21 |
2019-09-06 | t: use common $SQ variable | Denton Liu | 1 | -1/+0 |
2019-08-20 | t3430: avoid hard-coded object IDs | brian m. carlson | 1 | -8/+15 |
2019-07-31 | rebase -r: support merge strategies other than `recursive` | Johannes Schindelin | 1 | -0/+21 |
2019-07-09 | Merge branch 'pw/rebase-abort-clean-rewritten' | Junio C Hamano | 1 | -1/+17 |
2019-05-19 | rebase -r: always reword merge -c | Phillip Wood | 1 | -0/+13 |
2019-05-15 | rebase --abort/--quit: cleanup refs/rewritten | Phillip Wood | 1 | -1/+17 |
2019-04-02 | tests (rebase): spell out the `--force-rebase` option | Johannes Schindelin | 1 | -2/+2 |
2019-01-28 | implicit interactive rebase: don't run sequence editor | Phillip Wood | 1 | -1/+1 |
2018-11-13 | rebase -r: do not write MERGE_HEAD unless needed | Johannes Schindelin | 1 | -1/+1 |
2018-11-13 | rebase -r: demonstrate bug with conflicting merges | Johannes Schindelin | 1 | -0/+16 |
2018-08-20 | Merge branch 'pw/rebase-i-merge-segv-fix' | Junio C Hamano | 1 | -7/+23 |
2018-08-16 | rebase -i: fix SIGSEGV when 'merge <branch>' fails | Phillip Wood | 1 | -1/+14 |
2018-08-16 | t3430: add conflicting commit | Phillip Wood | 1 | -6/+9 |
2018-08-09 | rebase --exec: make it work with --rebase-merges | Johannes Schindelin | 1 | -1/+1 |
2018-08-06 | t3430: demonstrate what -r, --autosquash & --exec should do | Johannes Schindelin | 1 | -0/+17 |
2018-07-11 | rebase --rebase-merges: add support for octopus merges | Johannes Schindelin | 1 | -0/+34 |
2018-06-04 | Merge branch 'bc/t3430-fixup' | Junio C Hamano | 1 | -3/+2 |
2018-06-04 | t3430: test clean-up | brian m. carlson | 1 | -3/+2 |
2018-06-01 | Merge branch 'js/rebase-recreate-merge' | Junio C Hamano | 1 | -0/+17 |
2018-05-30 | sequencer: ensure labels that are object IDs are rewritten | brian m. carlson | 1 | -0/+17 |
2018-05-06 | rebase --rebase-merges: root commits can be cousins, too | Johannes Schindelin | 1 | -0/+25 |
2018-05-06 | rebase --rebase-merges: a "merge" into a new root is a fast-forward | Johannes Schindelin | 1 | -0/+13 |
2018-05-06 | sequencer: allow introducing new root commits | Johannes Schindelin | 1 | -0/+34 |
2018-04-26 | rebase -i: introduce --rebase-merges=[no-]rebase-cousins | Johannes Schindelin | 1 | -0/+18 |
2018-04-26 | rebase --rebase-merges: avoid "empty merges" | Johannes Schindelin | 1 | -0/+8 |
2018-04-26 | sequencer: handle post-rewrite for merge commands | Johannes Schindelin | 1 | -0/+25 |
2018-04-26 | sequencer: make refs generated by the `label` command worktree-local | Johannes Schindelin | 1 | -0/+14 |
2018-04-26 | rebase: introduce the --rebase-merges option | Johannes Schindelin | 1 | -0/+179 |