aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2013-10-25 04:37:09 +0200
committerMattias Andrée <maandree@operamail.com>2013-10-25 04:37:09 +0200
commit5c51568e63e63561012bdf265cce21080284682e (patch)
treebe3aec0f1adc4807dd8c20976e317c11cff974e4
parenttypo (diff)
downloadusing-git-5c51568e63e63561012bdf265cce21080284682e.tar.gz
using-git-5c51568e63e63561012bdf265cce21080284682e.tar.bz2
using-git-5c51568e63e63561012bdf265cce21080284682e.tar.xz
apply as an alternative to am
Signed-off-by: Mattias Andrée <maandree@operamail.com>
-rw-r--r--using-git.texinfo5
1 files changed, 5 insertions, 0 deletions
diff --git a/using-git.texinfo b/using-git.texinfo
index 42eadd3..1a56c33 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -817,6 +817,11 @@ and some projects will require it. To
sign off with @command{git am}, just add
@command{--signoff}.
+If you are unable to apply a patch with
+@command{git am} because of the patch's
+formatting, test @command{git apply}
+instead.
+
@node Making pull requests