diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:26:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:26:51 -0700 |
| commit | 8c4bcd34bd194d7932a153f464cbc6ada7b27b46 (patch) | |
| tree | 17331f7107c0353a5adac2451fc6e817ce16e902 /Documentation | |
| parent | 19100d3f7db17a85dc58265ae5388b1bf483f44f (diff) | |
| parent | e0e2065f74500119d5e12524992273de362acd30 (diff) | |
| download | git-8c4bcd34bd194d7932a153f464cbc6ada7b27b46.tar.gz git-8c4bcd34bd194d7932a153f464cbc6ada7b27b46.tar.xz | |
Merge branch 'jc/ll-merge-binary-ours' into maint
* jc/ll-merge-binary-ours:
ll-merge: warn about inability to merge binary files only when we can't
attr: "binary" attribute should choose built-in "binary" merge driver
merge: teach -Xours/-Xtheirs to binary ll-merge driver
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitattributes.txt | 2 | ||||
| -rw-r--r-- | Documentation/merge-strategies.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index aff760ef7..52ab93d2c 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -932,7 +932,7 @@ file at the toplevel (i.e. not in any subdirectory). The built-in macro attribute "binary" is equivalent to: ------------ -[attr]binary -diff -text +[attr]binary -diff -merge -text ------------ diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 595a3cf1a..66db80296 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -32,13 +32,14 @@ ours;; This option forces conflicting hunks to be auto-resolved cleanly by favoring 'our' 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. + This should not be confused with the 'ours' merge strategy, which does not even look at what the other tree contains at all. It discards everything the other tree did, declaring 'our' history contains all that happened in it. theirs;; - This is opposite of 'ours'. + This is the opposite of 'ours'. patience;; With this option, 'merge-recursive' spends a little extra time |