Re: git rebase: unexpected conflict
From: Michael S. Tsirkin <hidden>
Date: 2016-06-15 22:42:53
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: git rebase: unexpected conflict · Junio C Hamano <hidden>
- 2016-06-15 · Re: git rebase: unexpected conflict · Michael S. Tsirkin <hidden>
- 2016-06-15 · Re: git rebase: unexpected conflict · Junio C Hamano <hidden>
- 2016-06-15 · Re: git rebase: unexpected conflict · Linus Torvalds <torvalds@linux-foundation.org>
- 2016-06-15 · Re: git rebase: unexpected conflict · Michael S. Tsirkin <hidden>
quoted
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 <redacted> --
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