summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2014-10-01 10:28:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-01 20:53:28 (GMT)
commit47ba4662bfd755829edd24428cf2e4bc492d70a6 (patch)
tree4f04a57b1fda2809d50625524fbe4907880b0854 /Documentation
parent751bacedaa507b7b6d10b2c1f48e019a01a8fa6e (diff)
downloadgit-47ba4662bfd755829edd24428cf2e4bc492d70a6.zip
git-47ba4662bfd755829edd24428cf2e4bc492d70a6.tar.gz
git-47ba4662bfd755829edd24428cf2e4bc492d70a6.tar.bz2
lockfile: rename LOCK_NODEREF to LOCK_NO_DEREF
This makes it harder to misread the name as LOCK_NODE_REF. Suggested-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/technical/api-lockfile.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/technical/api-lockfile.txt b/Documentation/technical/api-lockfile.txt
index aa7d822..a3cb69b 100644
--- a/Documentation/technical/api-lockfile.txt
+++ b/Documentation/technical/api-lockfile.txt
@@ -110,11 +110,11 @@ Flags
The following flags can be passed to `hold_lock_file_for_update` or
`hold_lock_file_for_append`:
-LOCK_NODEREF::
+LOCK_NO_DEREF::
Usually symbolic links in the destination path are resolved
and the lockfile is created by adding ".lock" to the resolved
- path. If `LOCK_NODEREF` is set, then the lockfile is created
+ path. If `LOCK_NO_DEREF` is set, then the lockfile is created
by adding ".lock" to the path argument itself. This option is
used, for example, when locking a symbolic reference, which
for backwards-compatibility reasons can be a symbolic link