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

help: redirect to aliased commands for "git cmd --help"

Rasmus Villemoes committed almost 8 years ago

doc: fix a typo and clarify a sentence

Mihir Mehta committed almost 8 years ago

Third batch for 2.20

Junio C Hamano committed almost 8 years ago

Merge branch 'ab/fsck-skiplist'

Junio C Hamano committed almost 8 years ago

Merge branch 'ds/multi-pack-verify'

Junio C Hamano committed almost 8 years ago

Merge branch 'bc/hash-independent-tests'

Junio C Hamano committed almost 8 years ago

Merge branch 'nd/test-tool'

Junio C Hamano committed almost 8 years ago

Merge branch 'nd/config-split'

Junio C Hamano committed almost 8 years ago

subtree: add build targets 'man' and 'html'

Christian Hesse committed almost 8 years ago