Remi Lespinet writes:
> @@ -90,10 +90,13 @@ default. You can use `--no-utf8` to override this.
>
> -3::
> --3way::
> +--no-3way::
> When the patch does not apply cleanly, fall back on
> 3-way merge if the patch records the identity of blobs
> it is supposed to apply to and
Add the am.threeWay configuration variable to use the -3 or --3way
option of git am by default. When am.threeway is set and not desired
for a specific git am command, the --no-3way option can be used to
override it.
Signed-off-by: Remi Lespinet
---
Documentation/config.txt | 8
Documen
2 matches
Mail list logo
