diff options
Diffstat (limited to 'Documentation/merge-options.adoc')
| -rw-r--r-- | Documentation/merge-options.adoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-options.adoc b/Documentation/merge-options.adoc index 9d433265b2..952cb85e9a 100644 --- a/Documentation/merge-options.adoc +++ b/Documentation/merge-options.adoc @@ -56,7 +56,7 @@ ifdef::git-pull[] `--ff-only`:: Only update to the new history if there is no divergent local history. This is the default when no method for reconciling - divergent histories is provided (via the --rebase=* flags). + divergent histories is provided (via the `--rebase` flags). `--ff`:: `--no-ff`:: |