| commit | fd1a9e903fd2d1bcf49723c282f75c83908484f9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 2 Nov 2018 02:04:55 +0000 (2 11:04 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 2 Nov 2018 02:04:55 +0000 (2 11:04 +0900) | ||
| tree | 257775067fbd0f8d921bd5d9578deb77fe54985b | treesnapshot (tar.gz zip) |
| parent | 0293121717ba66f089a38ce4d4d895db0f946e49 | commitdiff |
| parent | b361bd754d141ef1010286dbe5fe810992a498a0 | commitdiff |
Merge branch 'pk/rebase-in-c-5-test'
Rewrite "git rebase" in C.
* pk/rebase-in-c-5-test:
builtin rebase: error out on incompatible option/mode combinations
builtin rebase: use no-op editor when interactive is "implied"
builtin rebase: show progress when connected to a terminal
builtin rebase: fast-forward to onto if it is a proper descendant
builtin rebase: optionally pass custom reflogs to reset_head()
builtin rebase: optionally auto-detect the upstream
Rewrite "git rebase" in C.
* pk/rebase-in-c-5-test:
builtin rebase: error out on incompatible option/mode combinations
builtin rebase: use no-op editor when interactive is "implied"
builtin rebase: show progress when connected to a terminal
builtin rebase: fast-forward to onto if it is a proper descendant
builtin rebase: optionally pass custom reflogs to reset_head()
builtin rebase: optionally auto-detect the upstream
| builtin/rebase.c | diff1 | diff2 | blobhistory |