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:
David Pursehouse 2013-09-16 22:25:05 +09:00
parent b9f2e4bd18
commit a80f0e2062
2 changed files with 2 additions and 0 deletions

View File

@ -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.

View File

@ -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.