* [PATCH] Document the --no-commit flag
@ 2005-11-04 14:55 Petr Baudis
2005-12-04 23:25 ` Petr Baudis
0 siblings, 1 reply; 3+ messages in thread
From: Petr Baudis @ 2005-11-04 14:55 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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=
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Document the --no-commit flag
2005-11-04 14:55 [PATCH] Document the --no-commit flag Petr Baudis
@ 2005-12-04 23:25 ` Petr Baudis
2005-12-05 0:04 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Petr Baudis @ 2005-12-04 23:25 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Document the --no-commit flag
2005-12-04 23:25 ` Petr Baudis
@ 2005-12-05 0:04 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2005-12-05 0:04 UTC (permalink / raw)
To: Petr Baudis; +Cc: git
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-12-05 0:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-11-04 14:55 [PATCH] Document the --no-commit flag Petr Baudis
2005-12-04 23:25 ` Petr Baudis
2005-12-05 0:04 ` Junio C Hamano
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).