Matthieu Moy matthieu@grenoble-inp.fr writes
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
+am.threeWay::
+By default, git-am will fail if the patch does not apply cleanly.
http://article.gmane.org/gmane.comp.version-control.git/270538
Ok sorry.
Thanks
--
To
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
+am.threeWay::
+ By default, git-am will fail if the patch does not apply cleanly.
http://article.gmane.org/gmane.comp.version-control.git/270538
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list:
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index d412f6b..0472182 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
...
+am.threeWay::
+ By default, git-am will fail if the patch does
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 remi.lespi...@ensimag.grenoble-inp.fr
---
Even if
4 matches
Mail list logo