diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-24 21:21:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 21:21:42 +0200 |
| commit | a1eaf8655dcf81576f1cc6becdc63ae0de7c84d5 (patch) | |
| tree | 720a2f6189c5eee246df8c88c7cf3b55d9b6f710 /Documentation | |
| parent | Merge branch 'qn/blame-show-email' (diff) | |
| parent | pull: use git-rev-parse --parseopt for option parsing (diff) | |
| download | git-a1eaf8655dcf81576f1cc6becdc63ae0de7c84d5.tar.xz git-a1eaf8655dcf81576f1cc6becdc63ae0de7c84d5.zip | |
Merge branch 'pt/pull-optparse'
"git pull" has become more aware of the options meant for
underlying "git fetch" and then learned to use parse-options
parser.
* pt/pull-optparse:
pull: use git-rev-parse --parseopt for option parsing
pull: handle git-fetch's options as well
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pull.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 712ab4baed..93c72a29ce 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -74,9 +74,6 @@ pulling or stash them away with linkgit:git-stash[1]. OPTIONS ------- -Options meant for 'git pull' itself and the underlying 'git merge' -must be given before the options meant for 'git fetch'. - -q:: --quiet:: This is passed to both underlying git-fetch to squelch reporting of |