[PATCH] Document the --no-commit flag

Petr Baudis· Nov 4, 2005, 14:55 UTC · lore

Also add the reference to merge and fetch options in git-pull's synopsis.

Signed-off-by: Petr Baudis <pasky@suse.cz>
---

 Documentation/git-merge.txt |    6 +++++-
 Documentation/git-pull.txt  |    2 +-
 git-pull.sh                 |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

Show changes to 3 files +7 −3

Documentation/git-merge.txt, Documentation/git-pull.txt, git-pull.sh

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 8c9c4d8..4174da9 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -8,7 +8,7 @@ git-merge - Grand Unified Merge Driver
 
 SYNOPSIS
 --------
-'git-merge' [-n] [-s <strategy>]... <msg> <head> <remote> <remote>...
+'git-merge' [-n] [--no-commit] [-s <strategy>]... <msg> <head> <remote> <remote>...
 
 
 DESCRIPTION
@@ -22,6 +22,10 @@ OPTIONS
 -n::
 	Do not show diffstat at the end of the merge.
 
+--no-commit::
+	Do not commit right away - it just does the merge and lets you commit
+	manually after you inspect the changes done.
+
 -s <strategy>::
 	use that merge strategy; can be given more than once to
 	specify them in the order they should be tried.  If
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index cef4c0a..a46d6b9 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -8,7 +8,7 @@ git-pull - Pull and merge from another r
 
 SYNOPSIS
 --------
-'git-pull' <repository> <refspec>...
+'git-pull' [merge_options] [fetch_options] <repository> <refspec>...
 
 
 DESCRIPTION
diff --git a/git-pull.sh b/git-pull.sh
index 9601627..e23d4f5 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -7,7 +7,7 @@
 . git-sh-setup || die "Not a git archive"
 
 usage () {
-    die "git pull [-n] [-s strategy]... <repo> <head>..."
+    die "git pull [-n] [--no-commit] [-s strategy]... <repo> <head>..."
 }
 
 strategy_args= no_summary= no_commit=

Petr Baudis· Dec 4, 2005, 23:25 UTC · re: Petr Baudis · lore

Re: [PATCH] Document the --no-commit flag

Dear diary, on Fri, Nov 04, 2005 at 03:55:05PM CET, I got a letter where Petr Baudis <pasky@suse.cz> said that...

> Also add the reference to merge and fetch options in git-pull's synopsis.
> 
> Signed-off-by: Petr Baudis <pasky@suse.cz>

Any problems with this patch?

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.

Junio C Hamano· Dec 5, 2005, 00:04 UTC · re: Petr Baudis · lore

Re: [PATCH] Document the --no-commit flag

Petr Baudis <pasky@suse.cz> writes:

> Any problems with this patch?

It has been done a bit differently by Jon Loeliger (please see Documentation/merge-options.txt).

Anyways, thanks for the patch and attention to the detail. Always appreciated.

patchDocument the --no-commit flag