Add REBASE_IF_NECESSARY in documentation of add-project and set-project
The documentation of the submit type in these commands was missing the REBASE_IF_NECESSARY option. Bug: Issue 2124 Change-Id: Iac0c81aeecbe15e72d5ad2281e61e4f211844ff8
This commit is contained in:
parent
b9f2e4bd18
commit
a80f0e2062
@ -109,6 +109,7 @@ Description values containing spaces should be quoted in single quotes
|
||||
+
|
||||
* FAST_FORWARD_ONLY: produces a strictly linear history.
|
||||
* MERGE_IF_NECESSARY: create a merge commit when required.
|
||||
* REBASE_IF_NECESSARY: rebase the commit when required.
|
||||
* MERGE_ALWAYS: always create a merge commit.
|
||||
* CHERRY_PICK: always cherry-pick the commit.
|
||||
|
||||
|
@ -57,6 +57,7 @@ Description values containing spaces should be quoted in single quotes
|
||||
+
|
||||
* FAST_FORWARD_ONLY: produces a strictly linear history.
|
||||
* MERGE_IF_NECESSARY: create a merge commit when required.
|
||||
* REBASE_IF_NECESSARY: rebase the commit when required.
|
||||
* MERGE_ALWAYS: always create a merge commit.
|
||||
* CHERRY_PICK: always cherry-pick the commit.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user