diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-14 22:32:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-14 22:32:14 -0700 |
| commit | a3cfb7673d419cac3d57ad89e67537288d20696f (patch) | |
| tree | a6366f1e938e2c6b45d8057be7c7bb34ab2c09c6 /git-rebase.html | |
| parent | f76c10b8a30ffeb8136343eab5ec87651a9e8e8c (diff) | |
| download | git-htmldocs-a3cfb7673d419cac3d57ad89e67537288d20696f.tar.gz | |
Autogenerated HTML docs for v1.7.12-464-g83379
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase.html b/git-rebase.html index 22efb4857..2db11488d 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1169,6 +1169,7 @@ ours This option forces conflicting hunks to be auto-resolved cleanly by
favoring <em>our</em> version. Changes from the other tree that do not
conflict with our side are reflected to the merge result.
+ For a binary file, the entire contents are taken from our side.
</p>
<div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
even look at what the other tree contains at all. It discards everything
@@ -1179,7 +1180,7 @@ theirs </dt>
<dd>
<p>
- This is opposite of <em>ours</em>.
+ This is the opposite of <em>ours</em>.
</p>
</dd>
<dt class="hdlist1">
|