diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-12-23 08:16:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-12-23 08:16:38 +0000 |
| commit | f556fc2a7c28ca2b4097c2c8b0180de3b8ca7238 (patch) | |
| tree | 492751e5dfadd3be5f438844968502b050c72c54 /gitattributes.html | |
| parent | e27cbd23f20512f381606e2b437bfe80c681aa93 (diff) | |
| download | git-htmldocs-f556fc2a7c28ca2b4097c2c8b0180de3b8ca7238.tar.gz | |
Autogenerated HTML docs for v1.5.4-rc1-21-g0e545
Diffstat (limited to 'gitattributes.html')
| -rw-r--r-- | gitattributes.html | 49 |
1 files changed, 45 insertions, 4 deletions
diff --git a/gitattributes.html b/gitattributes.html index 488ddc3ba..b53e571a7 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -599,10 +599,51 @@ String </p>
</dd>
</dl>
+<h4>Built-in merge drivers</h4>
+<p>There are a few built-in low-level merge drivers defined that
+can be asked for via the <tt>merge</tt> attribute.</p>
+<dl>
+<dt>
+text
+</dt>
+<dd>
+<p>
+ Usual 3-way file level merge for text files. Conflicted
+ regions are marked with conflict markers <tt><<<<<<<</tt>,
+ <tt>=======</tt> and <tt>>>>>>>></tt>. The version from your branch
+ appears before the <tt>=======</tt> marker, and the version
+ from the merged branch appears after the <tt>=======</tt>
+ marker.
+</p>
+</dd>
+<dt>
+binary
+</dt>
+<dd>
+<p>
+ Keep the version from your branch in the work tree, but
+ leave the path in the conflicted state for the user to
+ sort out.
+</p>
+</dd>
+<dt>
+union
+</dt>
+<dd>
+<p>
+ Run 3-way file level merge for text files, but take
+ lines from both versions, instead of leaving conflict
+ markers. This tends to leave the added lines in the
+ resulting file in random order and the user should
+ verify the result. Do not use this if you do not
+ understand the implications.
+</p>
+</dd>
+</dl>
<h4>Defining a custom merge driver</h4>
-<p>The definition of a merge driver is done in <tt>gitconfig</tt> not
-<tt>gitattributes</tt> file, so strictly speaking this manual page is a
-wrong place to talk about it. However…</p>
+<p>The definition of a merge driver is done in the <tt>.git/config</tt>
+file, not in the <tt>gitattributes</tt> file, so strictly speaking this
+manual page is a wrong place to talk about it. However…</p>
<p>To define a custom merge driver <tt>filfre</tt>, add a section to your
<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file) like this:</p>
<div class="listingblock">
@@ -746,7 +787,7 @@ commit hash.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 09-Dec-2007 10:19:08 UTC
+Last updated 23-Dec-2007 08:15:27 UTC
</div>
</div>
</body>
|