diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-18 23:01:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-18 23:01:31 -0700 |
| commit | 804edc13ae07ddfccad8c149a68a0ab95d5e5441 (patch) | |
| tree | a1a252b3d522f7d887c37f8d1c03500dbf37218f /Documentation | |
| parent | c22e5e994a12b1c986427e8bdba6d86899f1aa30 (diff) | |
| parent | b0fa7ab51b29d34579d8f6bb4443dfbcb8278c7a (diff) | |
| download | git-804edc13ae07ddfccad8c149a68a0ab95d5e5441.tar.gz | |
Merge branch 'cc/replace-no-replace'
* cc/replace-no-replace:
git: add --no-replace-objects option to disable replacing
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-replace.txt | 21 | ||||
| -rw-r--r-- | Documentation/git.txt | 6 |
2 files changed, 26 insertions, 1 deletions
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 915cb77b29..8adc1ef55c 100644 --- a/Documentation/git-replace.txt +++ b/Documentation/git-replace.txt @@ -23,6 +23,26 @@ replacement object. 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). + +It is possible to disable use of replacement refs for any command +using the --no-replace-objects option just after "git". + +For example if commit "foo" has been replaced by commit "bar": + +------------------------------------------------ +$ git --no-replace-object cat-file commit foo +------------------------------------------------ + +show information about commit "foo", while: + +------------------------------------------------ +$ git cat-file commit foo +------------------------------------------------ + +show information about commit "bar". + OPTIONS ------- -f:: @@ -54,6 +74,7 @@ SEE ALSO -------- linkgit:git-tag[1] linkgit:git-branch[1] +linkgit:git[1] Author ------ diff --git a/Documentation/git.txt b/Documentation/git.txt index d11c5c1651..df46a34371 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path] - [-p|--paginate|--no-pager] + [-p|--paginate|--no-pager] [--no-replace-objects] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS] @@ -238,6 +238,10 @@ help ...`. environment is not set, it is set to the current working directory. +--no-replace-objects:: + Do not use replacement refs to replace git objects. See + linkgit:git-replace[1] for more information. + FURTHER DOCUMENTATION --------------------- |