{"thread":{"id":"2344","subject":"[PATCH] Document the --no-commit flag","startedAt":"2005-11-04T14:55:05Z","lastAt":"2005-12-05T00:04:56Z","messageCount":3,"participants":["Petr Baudis","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"11122","messageId":"20051104145505.6586.32084.stgit@machine.or.cz","threadId":"2344","inReplyTo":null,"subject":"[PATCH] Document the --no-commit flag","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-11-04T14:55:05Z","receivedAt":"2005-11-04T14:55:05Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Also add the reference to merge and fetch options in git-pull's synopsis.\n\nSigned-off-by: Petr Baudis <pasky@suse.cz>\n---\n\n Documentation/git-merge.txt |    6 +++++-\n Documentation/git-pull.txt  |    2 +-\n git-pull.sh                 |    2 +-\n 3 files changed, 7 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 8c9c4d8..4174da9 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -8,7 +8,7 @@ git-merge - Grand Unified Merge Driver\n \n SYNOPSIS\n --------\n-'git-merge' [-n] [-s <strategy>]... <msg> <head> <remote> <remote>...\n+'git-merge' [-n] [--no-commit] [-s <strategy>]... <msg> <head> <remote> <remote>...\n \n \n DESCRIPTION\n@@ -22,6 +22,10 @@ OPTIONS\n -n::\n \tDo not show diffstat at the end of the merge.\n \n+--no-commit::\n+\tDo not commit right away - it just does the merge and lets you commit\n+\tmanually after you inspect the changes done.\n+\n -s <strategy>::\n \tuse that merge strategy; can be given more than once to\n \tspecify them in the order they should be tried.  If\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex cef4c0a..a46d6b9 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -8,7 +8,7 @@ git-pull - Pull and merge from another r\n \n SYNOPSIS\n --------\n-'git-pull' <repository> <refspec>...\n+'git-pull' [merge_options] [fetch_options] <repository> <refspec>...\n \n \n DESCRIPTION\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 9601627..e23d4f5 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -7,7 +7,7 @@\n . git-sh-setup || die \"Not a git archive\"\n \n usage () {\n-    die \"git pull [-n] [-s strategy]... <repo> <head>...\"\n+    die \"git pull [-n] [--no-commit] [-s strategy]... <repo> <head>...\"\n }\n \n strategy_args= no_summary= no_commit=\n"},{"id":"13186","messageId":"20051204232505.GZ22159@pasky.or.cz","threadId":"2344","inReplyTo":"20051104145505.6586.32084.stgit@machine.or.cz","subject":"Re: [PATCH] Document the --no-commit flag","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-12-04T23:25:05Z","receivedAt":"2005-12-04T23:25:05Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Fri, Nov 04, 2005 at 03:55:05PM CET, I got a letter\nwhere Petr Baudis <pasky@suse.cz> said that...\n> Also add the reference to merge and fetch options in git-pull's synopsis.\n> \n> Signed-off-by: Petr Baudis <pasky@suse.cz>\n\nAny problems with this patch?\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"},{"id":"13190","messageId":"7vbqzwe7dj.fsf@assigned-by-dhcp.cox.net","threadId":"2344","inReplyTo":"20051204232505.GZ22159@pasky.or.cz","subject":"Re: [PATCH] Document the --no-commit flag","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-12-05T00:04:56Z","receivedAt":"2005-12-05T00:04:56Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Petr Baudis <pasky@suse.cz> writes:\n\n> Any problems with this patch?\n\nIt has been done a bit differently by Jon Loeliger (please see\nDocumentation/merge-options.txt).\n\nAnyways, thanks for the patch and attention to the detail.\nAlways appreciated.\n"}]}