Skip to content
  • Junio C Hamano's avatar
    Merge branch 'pk/rebase-in-c-4-opts' · 02931217
    Junio C Hamano authored
    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"
    02931217