diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-09-03 21:33:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-09-03 21:33:06 +0000 |
| commit | 2db3e750d172a78dadfb29235ad2a2c3c8d45a24 (patch) | |
| tree | 1f66627398f37b23ec3af2697514d33d25060d96 /git-pull.html | |
| parent | d7ae629d13f3242b66070b20f4bb83486948150a (diff) | |
| download | git-htmldocs-2db3e750d172a78dadfb29235ad2a2c3c8d45a24.tar.gz | |
Autogenerated HTML docs for v1.7.2.3-313-gcd15
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/git-pull.html b/git-pull.html index 0a6ac0553..efe73718c 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1089,6 +1089,28 @@ theirs </p>
</dd>
<dt>
+renormalize
+</dt>
+<dd>
+<p>
+ This runs a virtual check-out and check-in of all three stages
+ of a file when resolving a three-way merge. This option is
+ meant to be used when merging branches with different clean
+ filters or end-of-line normalization rules. See "Merging
+ branches with differing checkin/checkout attributes" in
+ <a href="gitattributes.html">gitattributes(5)</a> for details.
+</p>
+</dd>
+<dt>
+no-renormalize
+</dt>
+<dd>
+<p>
+ Disables the <tt>renormalize</tt> option. This overrides the
+ <tt>merge.renormalize</tt> configuration variable.
+</p>
+</dd>
+<dt>
subtree[=path]
</dt>
<dd>
@@ -1257,7 +1279,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-01 18:42:45 UTC
+Last updated 2010-09-03 21:30:26 UTC
</div>
</div>
</body>
|