diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-23 22:24:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-23 22:24:01 -0800 |
| commit | 783cfafb91538c178d78a9f6c7b609e4f06582f8 (patch) | |
| tree | 242cb4414ba31ea251d701c8ebdf25f01ce3f4f8 /Documentation | |
| parent | 75a7ea258c0644b79e57cab3a345807f4017dfd2 (diff) | |
| parent | 0de8b94720501e869a05c52a691985fa4ce69803 (diff) | |
| download | git-783cfafb91538c178d78a9f6c7b609e4f06582f8.tar.gz | |
Merge branch 'cc/replace'
* cc/replace:
Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
Documentation: fix typos and spelling in replace documentation
replace: use a GIT_NO_REPLACE_OBJECTS env variable
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-replace.txt | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 8adc1ef55c..65a0da508a 100644 --- a/Documentation/git-replace.txt +++ b/Documentation/git-replace.txt @@ -17,31 +17,35 @@ DESCRIPTION Adds a 'replace' reference in `.git/refs/replace/` 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 +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 +Unless `-f` is given, the 'replace' reference must not yet exist in `.git/refs/replace/` directory. -Replace references will be used by default by all git commands except -those doing reachability traversal (prune, pack transfer and fsck). +Replacement references will be used by default by all git commands +except those doing reachability traversal (prune, pack transfer and +fsck). -It is possible to disable use of replacement refs for any command -using the --no-replace-objects option just after "git". +It is possible to disable use of replacement references for any +command using the `--no-replace-objects` option just after 'git'. -For example if commit "foo" has been replaced by commit "bar": +For example if commit 'foo' has been replaced by commit 'bar': ------------------------------------------------ -$ git --no-replace-object cat-file commit foo +$ git --no-replace-objects cat-file commit foo ------------------------------------------------ -show information about commit "foo", while: +shows information about commit 'foo', while: ------------------------------------------------ $ git cat-file commit foo ------------------------------------------------ -show information about commit "bar". +shows information about commit 'bar'. + +The 'GIT_NO_REPLACE_OBJECTS' environment variable can be set to +achieve the same effect as the `--no-replace-objects` option. OPTIONS ------- |