builtin rebase: prepare for builtin rebase -i

Johannes Schindelin committed almost 8 years ago

Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c

Junio C Hamano committed almost 8 years ago

builtin rebase: error out on incompatible option/mode combinations

Pratik Karki committed about 8 years ago

builtin rebase: use no-op editor when interactive is "implied"

Pratik Karki committed about 8 years ago

builtin rebase: show progress when connected to a terminal

Pratik Karki committed about 8 years ago

builtin rebase: fast-forward to onto if it is a proper descendant

Pratik Karki committed about 8 years ago

builtin rebase: optionally pass custom reflogs to reset_head()

Pratik Karki committed about 8 years ago

builtin rebase: optionally auto-detect the upstream

Pratik Karki committed about 8 years ago

builtin rebase: support --root

Pratik Karki committed about 8 years ago

builtin rebase: add support for custom merge strategies

Pratik Karki committed about 8 years ago

builtin rebase: support `fork-point` option

Pratik Karki committed about 8 years ago

merge-base --fork-point: extract libified function

Pratik Karki committed about 8 years ago

builtin rebase: support --rebase-merges[=[no-]rebase-cousins]

Pratik Karki committed about 8 years ago

builtin rebase: support `--allow-empty-message` option

Pratik Karki committed about 8 years ago

builtin rebase: support `--exec`

Pratik Karki committed about 8 years ago

builtin rebase: support `--autostash` option

Pratik Karki committed about 8 years ago

builtin rebase: support `-C` and `--whitespace=<type>`

Pratik Karki committed about 8 years ago

builtin rebase: support `--gpg-sign` option

Pratik Karki committed about 8 years ago

git-help.txt: document "git help cmd" vs "git cmd --help" for aliases

Rasmus Villemoes committed almost 8 years ago

git.c: handle_alias: prepend alias info when first argument is -h

Rasmus Villemoes committed almost 8 years ago