]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rs/pull-options-sync-code-and-doc'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:42:45 +0000 (13:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:42:45 +0000 (13:42 -0700)
"git pull" shares many options with underlying "git fetch", but
some of them were not documented and some of those that would make
sense to pass down were not passed down.

* rs/pull-options-sync-code-and-doc:
  pull: pass documented fetch options on
  pull: remove --update-head-ok from documentation

1  2 
builtin/pull.c

diff --cc builtin/pull.c
Simple merge