diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 21:33:52 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 21:33:52 +0300 |
| commit | 42a6274b62397ab0047a21729c99f8fb06193f9b (patch) | |
| tree | ab4cbf6e8f9cdd4d39bd75df627e8f440ca24a53 /Documentation | |
| parent | 03e904cbd600afee7a39160aabc79a628916eecc (diff) | |
| parent | b81699af4861f9363cdebb86e8f3d95bd0b794dc (diff) | |
Merge branch 'ab/fetch-tags-noclobber'
Test and doc clean-ups.
* ab/fetch-tags-noclobber:
pull doc: fix a long-standing grammar error
fetch tests: correct a comment "remove it" -> "remove them"
push tests: assert re-pushing annotated tags
push tests: add more testing for forced tag pushing
push tests: fix logic error in "push" test assertion
push tests: remove redundant 'git push' invocation
fetch tests: change "Tag" test tag to "testTag"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/pull-fetch-param.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index c579793af5..f1fb08dc68 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -33,7 +33,7 @@ name. it requests fetching everything up to the given tag. + The remote ref that matches <src> -is fetched, and if <dst> is not empty string, the local +is fetched, and if <dst> is not an empty string, the local ref that matches it is fast-forwarded using <src>. If the optional plus `+` is used, the local ref is updated even if it does not result in a fast-forward |