]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/rebase.c
Merge branch 'pk/rebase-in-c-2-basic'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 02:04:53 +0000 (11:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 02:04:53 +0000 (11:04 +0900)
commite0720a3867b85ad2fe0e92378973670b8b7f444b
tree4bc3dddf5f5bd0ed3b022565bafe8977b00ba05a
parentb49ef560ed66449d24a3fdfe25972c390bb44951
parente65123a71d0ca134f901e2340674a712e70ce023
Merge branch 'pk/rebase-in-c-2-basic'

Rewrite "git rebase" in C.

* pk/rebase-in-c-2-basic:
  builtin rebase: support `git rebase <upstream> <switch-to>`
  builtin rebase: only store fully-qualified refs in `options.head_name`
  builtin rebase: start a new rebase only if none is in progress
  builtin rebase: support --force-rebase
  builtin rebase: try to fast forward when possible
  builtin rebase: require a clean worktree
  builtin rebase: support the `verbose` and `diffstat` options
  builtin rebase: support --quiet
  builtin rebase: handle the pre-rebase hook and --no-verify
  builtin rebase: support `git rebase --onto A...B`
  builtin rebase: support --onto
builtin/rebase.c