From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Oct 2009 06:01:31 +0000 (-0700)
Subject: Merge branch 'cc/replace-no-replace'
X-Git-Tag: v1.6.6-rc0~113
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/804edc13ae07ddfccad8c149a68a0ab95d5e5441?ds=inline;hp=-c

Merge branch 'cc/replace-no-replace'

* cc/replace-no-replace:
git: add --no-replace-objects option to disable replacing
---

804edc13ae07ddfccad8c149a68a0ab95d5e5441
diff --combined Documentation/git.txt
index d11c5c1651,2f4541780a..df46a34371
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -10,7 -10,7 +10,7 @@@ SYNOPSI
  --------
  [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]
  
@@@ -46,7 -46,6 +46,7 @@@ Documentation for older releases are av
  * link:v1.6.5/git.html[documentation for release 1.6.5]
  
  * release notes for
 +  link:RelNotes-1.6.5.1.txt[1.6.5.1],
    link:RelNotes-1.6.5.txt[1.6.5].
  
  * link:v1.6.4.4/git.html[documentation for release 1.6.4.4]
@@@ -238,6 -237,10 +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
  ---------------------