Merge branch 'en/update-ref-no-deref-stdin'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:53 +0000 (10:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:53 +0000 (10:30 -0700)
"git update-ref" learned to make both "--no-deref" and "--stdin"
work at the same time.

* en/update-ref-no-deref-stdin:
update-ref: allow --no-deref with --stdin
update-ref: fix type of update_flags variable to match its usage

Trivial merge