diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:53 -0700 |
| commit | f52b7eea44281340e691e5ea89aaac831d2ac65f (patch) | |
| tree | c7bc5b2e302844919f3c591bf794acba57e1994f /Documentation/git-difftool.txt | |
| parent | Merge branch 'ms/remote-error-message-update' (diff) | |
| parent | update-ref: allow --no-deref with --stdin (diff) | |
| download | tgif-f52b7eea44281340e691e5ea89aaac831d2ac65f.tar.xz | |
Merge branch 'en/update-ref-no-deref-stdin'
"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 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions