diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:46 +0300 |
| commit | 50e6df214d7f75559e4ad90c2fd1d8fc36938c8c (patch) | |
| tree | e5e3e49ddf4b2442c1b3f6ca3a45c915b39dd63b /Documentation | |
| parent | 1fae869ef22c7599694c93d8ca40f36ecb916e16 (diff) | |
| parent | d345e9fbe75c8bec6469253f0ee7e34228f41917 (diff) | |
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 'Documentation')
| -rw-r--r-- | Documentation/git-update-ref.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-update-ref.txt b/Documentation/git-update-ref.txt index bc8fdfd469..fda8516677 100644 --- a/Documentation/git-update-ref.txt +++ b/Documentation/git-update-ref.txt @@ -8,7 +8,7 @@ git-update-ref - Update the object name stored in a ref safely SYNOPSIS -------- [verse] -'git update-ref' [-m <reason>] (-d <ref> [<oldvalue>] | [--no-deref] [--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z]) +'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<oldvalue>] | [--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z]) DESCRIPTION ----------- |