Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/mingw-fallouts'
[gitweb.git]
/
Documentation
/
git-am.txt
diff --git
a/Documentation/git-am.txt
b/Documentation/git-am.txt
index 7658fbdaef7ed0e9240630e5927ba936df95ffd0..e4a6b3a6f0fc258e8a2052d1d56a71fb57667d39 100644
(file)
--- a/
Documentation/git-am.txt
+++ b/
Documentation/git-am.txt
@@
-13,7
+13,6
@@
SYNOPSIS
[--3way] [--interactive] [--binary]
[--whitespace=<option>] [-C<n>] [-p<n>]
<mbox>|<Maildir>...
-
'git-am' [--skip | --resolved]
DESCRIPTION
@@
-159,4
+158,3
@@
Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
GIT
---
Part of the gitlink:git[7] suite
-