diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:46 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:46 +0900 |
commit | 50e6df214d7f75559e4ad90c2fd1d8fc36938c8c (patch) | |
tree | e5e3e49ddf4b2442c1b3f6ca3a45c915b39dd63b /t/t4108-apply-threeway.sh | |
parent | Merge branch 'ms/remote-error-message-update' into maint (diff) | |
parent | update-ref: allow --no-deref with --stdin (diff) | |
download | tgif-50e6df214d7f75559e4ad90c2fd1d8fc36938c8c.tar.xz |
Merge branch 'en/update-ref-no-deref-stdin' into maint
"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
Diffstat (limited to 't/t4108-apply-threeway.sh')
0 files changed, 0 insertions, 0 deletions