diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-22 11:52:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-22 11:52:55 -0700 |
| commit | 7e0c2036b46ee6eef295a7e6dcb3775e874aa780 (patch) | |
| tree | 85fba066428c09f13972f220dd5cad0f3487305a /Documentation/git-replace.txt | |
| parent | 92cdcc528402c4dc76a9facf3eb182cd9d659eb4 (diff) | |
| parent | 831e61f80fab2d3f9ba1773e657803dcf8b16432 (diff) | |
| download | git-7e0c2036b46ee6eef295a7e6dcb3775e874aa780.tar.gz git-7e0c2036b46ee6eef295a7e6dcb3775e874aa780.tar.xz | |
Merge branch 'jc/tag-doc'
Our documentation used to assume having files in .git/refs/*
directories was the only to have branches and tags, but that is not
true for quite some time.
* jc/tag-doc:
Documentation: do not mention .git/refs/* directories
Diffstat (limited to 'Documentation/git-replace.txt')
| -rw-r--r-- | Documentation/git-replace.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 17df52527..51131d085 100644 --- a/Documentation/git-replace.txt +++ b/Documentation/git-replace.txt @@ -14,14 +14,13 @@ SYNOPSIS DESCRIPTION ----------- -Adds a 'replace' reference in `.git/refs/replace/` +Adds a 'replace' reference in `refs/replace/` namespace. The name of the 'replace' reference is the SHA1 of the object that is replaced. The content of the 'replace' reference is the SHA1 of the replacement object. -Unless `-f` is given, the 'replace' reference must not yet exist in -`.git/refs/replace/` directory. +Unless `-f` is given, the 'replace' reference must not yet exist. Replacement references will be used by default by all git commands except those doing reachability traversal (prune, pack transfer and |