{"thread":{"id":"32000","subject":"[PATCH] commit: fixup misplacement of --no-post-rewrite description","startedAt":"2012-11-02T12:26:47Z","lastAt":"2012-11-02T13:22:59Z","messageCount":2,"participants":["Andreas Schwab","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"202414","messageId":"m2hap88a2g.fsf@igel.home","threadId":"32000","inReplyTo":null,"subject":"[PATCH] commit: fixup misplacement of --no-post-rewrite description","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2012-11-02T12:26:47Z","receivedAt":"2012-11-02T12:26:47Z","isPatch":true,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"In e858af6 (commit: document a couple of options) the description of the\n--no-post-rewrite option was put inside the paragraph for the --amend\noption.  Move it down after the paragraph.\n\nSigned-off-by: Andreas Schwab <schwab@linux-m68k.org>\n---\n Documentation/git-commit.txt | 7 +++----\n 1 file changed, 3 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex 9594ac8..28a5aeb 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -193,10 +193,6 @@ OPTIONS\n \tcurrent tip -- if it was a merge, it will have the parents of\n \tthe current tip as parents -- so the current top commit is\n \tdiscarded.\n-\n---no-post-rewrite::\n-\tBypass the post-rewrite hook.\n-\n +\n --\n It is a rough equivalent for:\n@@ -213,6 +209,9 @@ You should understand the implications of rewriting history if you\n amend a commit that has already been published.  (See the \"RECOVERING\n FROM UPSTREAM REBASE\" section in linkgit:git-rebase[1].)\n \n+--no-post-rewrite::\n+\tBypass the post-rewrite hook.\n+\n -i::\n --include::\n \tBefore making a commit out of staged contents so far,\n-- \n1.8.0\n\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"202418","messageId":"20121102132259.GD2598@sigill.intra.peff.net","threadId":"32000","inReplyTo":"m2hap88a2g.fsf@igel.home","subject":"Re: [PATCH] commit: fixup misplacement of --no-post-rewrite description","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-11-02T13:22:59Z","receivedAt":"2012-11-02T13:22:59Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Nov 02, 2012 at 01:26:47PM +0100, Andreas Schwab wrote:\n\n> In e858af6 (commit: document a couple of options) the description of the\n> --no-post-rewrite option was put inside the paragraph for the --amend\n> option.  Move it down after the paragraph.\n> \n> Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>\n\nThanks, the modified output looks much more sane.\n\n-Peff\n"}]}