From: Roberto Decurnex <decurnex.robe...@gmail.com> Making clear that `+` before a branch name will force the update even for non-fast-forward branches.
Signed-off-by: Roberto Decurnex <decurnex.robe...@gmail.com> --- Documentation/git-fetch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 8deb614..b971a2b 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -124,7 +124,7 @@ This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively) `pu` and `maint` from the remote repository. + -The `pu` branch will be updated even if it is does not fast-forward, +The `pu` branch will be updated even if it is non-fast-forward, because it is prefixed with a plus sign; `tmp` will not be. * Peek at a remote's branch, without configuring the remote in your local -- 2.0.4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
