diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-01 23:39:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-01 23:39:58 +0300 |
| commit | 6d6b412da32229bf6a5f366a72b5ad29cc70ce59 (patch) | |
| tree | b7536738d6dec7ff9cd60a9a891cc5e3e9f7e12e /compat/compiler.h | |
| parent | aabf3ea14439bccc87bdfd3d23315a19f928fab4 (diff) | |
| parent | a35413c3785bf71e2c018691d6cd5f93638ba9ae (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
Diffstat (limited to 'compat/compiler.h')
0 files changed, 0 insertions, 0 deletions