Re: [PATCH v3 1/7] git-rebase.txt: document incompatible options
From: SZEDER Gábor <hidden>
Date: 2018-06-22 08:33:13
quoted hunk ↗ jump to hunk
@@ -487,6 +510,52 @@ recreates the topic branch with fresh commits so it can be remerged successfully without needing to "revert the reversion" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details). +INCOMPATIBLE OPTIONS +-------------------- + +git-rebase has many flags that are incompatible with each other, +predominantly due to the fact that it has three different underlying +implementations: + + * one based on linkgit:git-am[1] (the default) + * one based on linkgit:git-merge-recursive[1] (merge backend)
Referencing a non-existing man page via the 'linkgit' macro causes
'make check-docs' to complain:
LINT lint-docs
./git-rebase.txt:511: no such source: git-merge-recursive[1]