Re: [RFC PATCH v2 1/7] git-rebase.txt: document incompatible options

Hi Eric,

On Sun, Jun 17, 2018 at 10:15 AM, Eric Sunshine [off-list ref] wrote:

On Sun, Jun 17, 2018 at 1:59 AM Elijah Newren [off-list ref] wrote:

quoted

git rebase has many options that only work with one of its three backends.
It also has a few other pairs of incompatible options.  Document these.

Signed-off-by: Elijah Newren <redacted>
---

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt

@@ -487,6 +510,51 @@ recreates the topic branch with fresh commits so it can be remerged
+Flags only understood by the interactive backend:
+ [...]
+ * --edit-todo
+ * --root + --onto

What does "+" mean? Is it "and"?

Yes, it means "and", though perhaps it'd be even clearer to write "in
combination with" or "when used in combination with"

quoted

+Other incompatible flag pairs:
+
+ * --preserve-merges && --interactive
+ * --preserve-merges && --signoff
+ * --preserve-merges && --rebase-merges
+ * --rebase-merges && --strategy

It's somewhat odd seeing "programmer" notation in end-user
documentation. Perhaps replace "&&" with "and"?

Yes, good point.  I'll make that fix.