From: Petr Baudis <pasky@suse.cz>
To: Junio C Hamano <junkio@cox.net>
Cc: <git@vger.kernel.org>
Subject: [PATCH] Document the --no-commit flag
Date: Fri, 04 Nov 2005 15:55:05 +0100 [thread overview]
Message-ID: <20051104145505.6586.32084.stgit@machine.or.cz> (raw)
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(-)
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=
next reply other threads:[~2005-11-04 14:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-04 14:55 Petr Baudis [this message]
2005-12-04 23:25 ` [PATCH] Document the --no-commit flag Petr Baudis
2005-12-05 0:04 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051104145505.6586.32084.stgit@machine.or.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).