Re: git rebase: unexpected conflict
> > 2. It's unfortunate that I need a temp file here.
> > Can git-am get stdin somehow?
>
> See "git-rebase.sh" around ll.325.
git-am can read standard input. Document this.
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
--
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index f7d551e..77ef103 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -21,6 +21,10 @@ current branch.
OPTIONS
-------
+<mbox>...::
+ The list of mailbox files to read patches from. If you do not
+ supply this argument, reads from the standard input.
+
--signoff::
Add `Signed-off-by:` line to the commit message, using
the committer identity of yourself.
--
MST