Matthieu Moy writes
> Remi Lespinet 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 unsubscribe from this list: send the line "unsubscribe git
Remi Lespinet 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: send the line "unsubscribe git" in
Remi Lespinet 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 not apply cleanly. When
> +
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
---
Even if git am will be rewritten soon, the code
4 matches
Mail list logo
