diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-01 13:39:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-01 13:39:58 -0700 |
| commit | 6d6b412da32229bf6a5f366a72b5ad29cc70ce59 (patch) | |
| tree | b7536738d6dec7ff9cd60a9a891cc5e3e9f7e12e /builtin/help.c | |
| parent | Merge branch 'ds/build-homebrew-gettext-fix' (diff) | |
| parent | rebase: display an error if --root and --fork-point are both provided (diff) | |
| download | git-6d6b412da32229bf6a5f366a72b5ad29cc70ce59.tar.gz git-6d6b412da32229bf6a5f366a72b5ad29cc70ce59.zip | |
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 'builtin/help.c')
0 files changed, 0 insertions, 0 deletions