Merge branch 'pk/rebase-in-c-4-opts'
commit0293121717ba66f089a38ce4d4d895db0f946e49
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 02:04:55 +0000 (2 11:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 02:04:55 +0000 (2 11:04 +0900)
tree2f9691ca131a570751e48f77b6a34c23352c352a
parent39f73315454d2553b2d3219a58f5110a60eba5a1
parent9dba809a69a7cd2a60e73d1ccaea0812b72b2b79
Merge branch 'pk/rebase-in-c-4-opts'

Rewrite "git rebase" in C.

* pk/rebase-in-c-4-opts:
  builtin rebase: support --root
  builtin rebase: add support for custom merge strategies
  builtin rebase: support `fork-point` option
  merge-base --fork-point: extract libified function
  builtin rebase: support --rebase-merges[=[no-]rebase-cousins]
  builtin rebase: support `--allow-empty-message` option
  builtin rebase: support `--exec`
  builtin rebase: support `--autostash` option
  builtin rebase: support `-C` and `--whitespace=<type>`
  builtin rebase: support `--gpg-sign` option
  builtin rebase: support `--autosquash`
  builtin rebase: support `keep-empty` option
  builtin rebase: support `ignore-date` option
  builtin rebase: support `ignore-whitespace` option
  builtin rebase: support --committer-date-is-author-date
  builtin rebase: support --rerere-autoupdate
  builtin rebase: support --signoff
  builtin rebase: allow selecting the rebase "backend"
builtin/merge-base.c
builtin/rebase.c
commit.c
commit.h