summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-20 09:18:47 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-20 09:18:47 (GMT)
commit063581e9b648b4da3b83061b06aed7ed417411e0 (patch)
treef9e833dc777db2963aa49bfc2bb5d29b457f33d6 /Documentation
parentcc93020f5213b589ff1e512185c47d8c38a4b994 (diff)
parent68db31cc289c686c4b4454dfbb121aff59a6c602 (diff)
downloadgit-063581e9b648b4da3b83061b06aed7ed417411e0.zip
git-063581e9b648b4da3b83061b06aed7ed417411e0.tar.gz
git-063581e9b648b4da3b83061b06aed7ed417411e0.tar.bz2
Merge branch 'sv/checkout'
* sv/checkout: git-update-ref: add --no-deref option for overwriting/detaching ref
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-update-ref.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-update-ref.txt b/Documentation/git-update-ref.txt
index 9424fea..f222616 100644
--- a/Documentation/git-update-ref.txt
+++ b/Documentation/git-update-ref.txt
@@ -7,7 +7,7 @@ git-update-ref - Update the object name stored in a ref safely
SYNOPSIS
--------
-'git-update-ref' [-m <reason>] (-d <ref> <oldvalue> | <ref> <newvalue> [<oldvalue>])
+'git-update-ref' [-m <reason>] (-d <ref> <oldvalue> | [--no-deref] <ref> <newvalue> [<oldvalue>])
DESCRIPTION
-----------
@@ -36,6 +36,9 @@ them and update them as a regular file (i.e. it will allow the
filesystem to follow them, but will overwrite such a symlink to
somewhere else with a regular filename).
+If --no-deref is given, <ref> itself is overwritten, rather than
+the result of following the symbolic pointers.
+
In general, using
git-update-ref HEAD "$head"