[PATCH] Document the --no-commit flag
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=
Petr Baudis <pasky@suse.cz>