diff options
Diffstat (limited to 'Documentation/merge-strategies.txt')
| -rw-r--r-- | Documentation/merge-strategies.txt | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index a5bc1dbb95..8676e26ca2 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -40,7 +40,19 @@ the other tree did, declaring 'our' history contains all that happened in it. theirs;; This is opposite of 'ours'. -subtree[=path];; +renormalize;; + 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 + linkgit:gitattributes[5] for details. + +no-renormalize;; + Disables the `renormalize` option. This overrides the + `merge.renormalize` configuration variable. + +subtree[=<path>];; This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be shifted to match with each other when merging. Instead, the specified path |