summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-19 06:01:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-10-19 06:01:31 (GMT)
commit804edc13ae07ddfccad8c149a68a0ab95d5e5441 (patch)
treea1a252b3d522f7d887c37f8d1c03500dbf37218f /Documentation/git.txt
parentc22e5e994a12b1c986427e8bdba6d86899f1aa30 (diff)
parentb0fa7ab51b29d34579d8f6bb4443dfbcb8278c7a (diff)
downloadgit-804edc13ae07ddfccad8c149a68a0ab95d5e5441.zip
git-804edc13ae07ddfccad8c149a68a0ab95d5e5441.tar.gz
git-804edc13ae07ddfccad8c149a68a0ab95d5e5441.tar.bz2
Merge branch 'cc/replace-no-replace'
* cc/replace-no-replace: git: add --no-replace-objects option to disable replacing
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index d11c5c1..df46a34 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
---------------------