diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-24 12:34:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-24 12:34:19 -0700 |
| commit | 871e293c9acbeaacce59dcd98fab6028f552f5be (patch) | |
| tree | c363ffb2dcced8d6e8057e31c5d7378508205c50 /Documentation/git-replace.txt | |
| parent | fab4b04e4be5ccfdf93e21e7260040bd9e7faedd (diff) | |
| parent | b52183179bb0a97ea4d91d1248aca303d8e8f892 (diff) | |
| download | git-871e293c9acbeaacce59dcd98fab6028f552f5be.tar.xz | |
Merge branch 'maint-1.7.11' into maint
* maint-1.7.11:
Prepare for 1.7.11.6
Make the ciabot scripts completely self-configuring in the normal case.
Improved documentation for the ciabot scripts.
man: git pull -r is a short for --rebase
gitcli: describe abbreviation of long options
rev-list docs: clarify --topo-order description
Documentation/CodingGuidelines: spell out more shell guidelines
Documentation: do not mention .git/refs/* directories
tests: Introduce test_seq
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 17df525275..51131d0858 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 |