]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aabf3ea a35413c)
Merge branch 'en/rebase-root-and-fork-point-are-incompatible'
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 May 2020 20:39:58 +0000 (13:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 May 2020 20:39:58 +0000 (13:39 -0700)
commit6d6b412da32229bf6a5f366a72b5ad29cc70ce59
treeb7536738d6dec7ff9cd60a9a891cc5e3e9f7e12etree | snapshot
parentaabf3ea14439bccc87bdfd3d23315a19f928fab4commit | diff
parenta35413c3785bf71e2c018691d6cd5f93638ba9aecommit | diff
Merge branch 'en/rebase-root-and-fork-point-are-incompatible'

Incompatible options "--root" and "--fork-point" of "git rebase"
have been marked and documented as being incompatible.

* en/rebase-root-and-fork-point-are-incompatible:
  rebase: display an error if --root and --fork-point are both provided
Documentation/git-rebase.txt diff1 | diff2 | blob | history
builtin/rebase.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.