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 /merge-strategies.txt | |
| parent | d7ae629d13f3242b66070b20f4bb83486948150a (diff) | |
| download | git-htmldocs-2db3e750d172a78dadfb29235ad2a2c3c8d45a24.tar.gz | |
Autogenerated HTML docs for v1.7.2.3-313-gcd15
Diffstat (limited to 'merge-strategies.txt')
| -rw-r--r-- | merge-strategies.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/merge-strategies.txt b/merge-strategies.txt index a5bc1dbb9..049313d60 100644 --- a/merge-strategies.txt +++ b/merge-strategies.txt @@ -40,6 +40,18 @@ the other tree did, declaring 'our' history contains all that happened in it. theirs;; This is opposite of 'ours'. +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 |