{"thread":{"id":"3804","subject":"[PATCH] git-commit: document --append","startedAt":"2006-04-05T19:16:08Z","lastAt":"2006-04-05T20:28:28Z","messageCount":5,"participants":["Marco Roeland","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"18397","messageId":"20060405191608.GA20572@fiberbit.xs4all.nl","threadId":"3804","inReplyTo":null,"subject":"[PATCH] git-commit: document --append","fromName":"Marco Roeland","fromEmail":"marco.roeland@xs4all.nl","sentAt":"2006-04-05T19:16:08Z","receivedAt":"2006-04-05T19:16:08Z","isPatch":true,"sender":{"key":"marco.roeland@xs4all.nl","avatar":null},"body":"The \"--amend\" option is used to amend the tip of the current branch. This\ndocumentation text was copied straight from the commit that implemented it.\n\nSigned-off-by: Marco Roeland \n\n---\n\n Documentation/git-commit.txt | 22 +++++++++++++++++++++-\n 1 files changed, 21 insertions(+), 1 deletions(-)\n\nca7d3b4fdd0cb24b7353da312fb9306531468f54\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex d04b342..3701cb3 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -9,7 +9,8 @@ SYNOPSIS\n --------\n [verse]\n 'git-commit' [-a] [-s] [-v] [(-c | -C) | -F | -m ]\n-\t [-e] [--author ] [--] [[-i | -o ]...]\n+\t [--no-verify] [--amend] [-e] [--author ]\n+\t [--] [[-i | -o ]...]\n \n DESCRIPTION\n -----------\n@@ -70,6 +71,25 @@ OPTIONS\n \t`-m`, and from file with `-C` are usually used as the\n \tcommit log message unmodified. This option lets you\n \tfurther edit the message taken from these sources.\n+\n+--amend::\n+\n+\tUsed to amend the tip of the current branch. Prepare the tree\n+\tobject you would want to replace the latest commit as usual\n+\t(this includes the usual -i/-o and explicit paths), and the\n+\tcommit log editor is seeded with the commit message from the\n+\ttip of the current branch. The commit you create replaces the\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+\tIt is a rough equivalent for:\n+\n+\t\t$ git reset --soft HEAD^\n+\t\t$ ... do something else to come up with the right tree ...\n+\t\t$ git commit -c ORIG_HEAD\n+\n+\tbut can be used to amend a merge commit.\n \n -i|--include::\n \tInstead of committing only the files specified on the\n-- \n1.3.0.rc2.gca38\n"},{"id":"18400","messageId":"7vfykr24wi.fsf@assigned-by-dhcp.cox.net","threadId":"3804","inReplyTo":"20060405191608.GA20572@fiberbit.xs4all.nl","subject":"Re: [PATCH] git-commit: document --append","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-04-05T19:34:05Z","receivedAt":"2006-04-05T19:34:05Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks for resurrecting this.\n\nI suspect that some formatting tweak is needed; I recall\nasciidoc needs some special formatting when multi- paragraph\ndescription is involved in the list.\n\nOf course, munging the patch title with s/append/amend/ would\nnot hurt ;-).\n"},{"id":"18401","messageId":"20060405194607.GB20854@fiberbit.xs4all.nl","threadId":"3804","inReplyTo":"7vfykr24wi.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] git-commit: document --append (amend really!)","fromName":"Marco Roeland","fromEmail":"marco.roeland@xs4all.nl","sentAt":"2006-04-05T19:46:07Z","receivedAt":"2006-04-05T19:46:07Z","isPatch":true,"sender":{"key":"marco.roeland@xs4all.nl","avatar":null},"body":"On Wednesday April 5th 2006 Junio C Hamano wrote:\n\n> Thanks for resurrecting this.\n> \n> I suspect that some formatting tweak is needed; I recall\n> asciidoc needs some special formatting when multi- paragraph\n> description is involved in the list.\n\nHere with asciidoc 7.1.2 (Debian 'sid') it looks good in the generated\nman page. But I'll investigate if nobody beats me to it. Perhaps we\nshould develop a \"sparse\" like module for asciidoc.\n\n> Of course, munging the patch title with s/append/amend/ would\n> not hurt ;-).\n\nOops. Well I suppose I could use \"git commit --amend\" and then run \"git\nformat-patch\" again I suppose. ;-)\n-- \nMarco Roeland\n"},{"id":"18402","messageId":"7vacaz23wr.fsf@assigned-by-dhcp.cox.net","threadId":"3804","inReplyTo":"20060405194607.GB20854@fiberbit.xs4all.nl","subject":"Re: [PATCH] git-commit: document --append (amend really!)","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-04-05T19:55:32Z","receivedAt":"2006-04-05T19:55:32Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Marco Roeland writes:\n\n> Here with asciidoc 7.1.2 (Debian 'sid') it looks good in the generated\n> man page. But I'll investigate if nobody beats me to it.\n\nPlease see below for an example.\n\n> Oops. Well I suppose I could use \"git commit --amend\" and then run \"git\n> format-patch\" again I suppose. ;-)\n\nYup ;-).\n\ndiff-tree b0d08a504bee17dfc46f761e166ff2c20c59a91a (from 3103cf9e1e09b0045a60542f24a2a1e4ed7b1237)\nAuthor: Francis Daly \nDate: Wed Mar 22 09:53:57 2006 +0000\n\n Format tweaks for asciidoc.\n \n Some documentation \"options\" were followed by independent preformatted\n paragraphs. Now they are associated plain text paragraphs. The\n difference is clear in the generated html.\n \n Signed-off-by: Junio C Hamano \n\ndiff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt\nindex fbd2394..d55456a 100644\n--- a/Documentation/git-grep.txt\n+++ b/Documentation/git-grep.txt\n@@ -24,13 +24,13 @@ OPTIONS\n \n