git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Fix spelling mistake; flagg -> flag
@ 2008-02-02 23:58 Jörg Sommer
  2008-02-02 23:58 ` [PATCH] Unify the argument of the parameter -m Jörg Sommer
  0 siblings, 1 reply; 4+ messages in thread
From: Jörg Sommer @ 2008-02-02 23:58 UTC (permalink / raw)
  To: git; +Cc: Jörg Sommer

Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
---
 git-am.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-am.sh b/git-am.sh
index 5f0f241..2ecebc4 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -14,7 +14,7 @@ b,binary        pass --allo-binary-replacement to git-apply
 3,3way          allow fall back on 3way merging if needed
 s,signoff       add a Signed-off-by line to the commit message
 u,utf8          recode into utf8 (default)
-k,keep          pass -k flagg to git-mailinfo
+k,keep          pass -k flag to git-mailinfo
 whitespace=     pass it through git-apply
 C=              pass it through git-apply
 p=              pass it through git-apply
-- 
1.5.4.rc5

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH] Unify the argument of the parameter -m
  2008-02-02 23:58 [PATCH] Fix spelling mistake; flagg -> flag Jörg Sommer
@ 2008-02-02 23:58 ` Jörg Sommer
  2008-02-02 23:58   ` [PATCH] Unify the name of the second option in the text Jörg Sommer
  0 siblings, 1 reply; 4+ messages in thread
From: Jörg Sommer @ 2008-02-02 23:58 UTC (permalink / raw)
  To: git; +Cc: Jörg Sommer

In the text, the agument of -m is <master> which should be used in the
command synopsis, too.

Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
---
 Documentation/git-remote.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 10f6fa5..2cbd1f7 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git-remote'
-'git-remote' add [-t <branch>] [-m <branch>] [-f] [--mirror] <name> <url>
+'git-remote' add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>
 'git-remote' rm <name>
 'git-remote' show <name>
 'git-remote' prune <name>
-- 
1.5.4.rc5

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH] Unify the name of the second option in the text
  2008-02-02 23:58 ` [PATCH] Unify the argument of the parameter -m Jörg Sommer
@ 2008-02-02 23:58   ` Jörg Sommer
  2008-02-03 12:04     ` Jakub Narebski
  0 siblings, 1 reply; 4+ messages in thread
From: Jörg Sommer @ 2008-02-02 23:58 UTC (permalink / raw)
  To: git; +Cc: Jörg Sommer

Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
---
 Documentation/git-push.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 5f24944..18e0c06 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -53,7 +53,7 @@ side are updated.
 +
 `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
 +
-A parameter <ref> without a colon pushes the <ref> from the source
+A parameter <refspec> without a colon pushes the <refspec> from the source
 repository to the destination repository under the same name.
 +
 Pushing an empty <src> allows you to delete the <dst> ref from
-- 
1.5.4.rc5

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] Unify the name of the second option in the text
  2008-02-02 23:58   ` [PATCH] Unify the name of the second option in the text Jörg Sommer
@ 2008-02-03 12:04     ` Jakub Narebski
  0 siblings, 0 replies; 4+ messages in thread
From: Jakub Narebski @ 2008-02-03 12:04 UTC (permalink / raw)
  To: Jörg Sommer; +Cc: git

Jörg Sommer <joerg@alea.gnuu.de> writes:

> Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
> ---
>  Documentation/git-push.txt |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
> index 5f24944..18e0c06 100644
> --- a/Documentation/git-push.txt
> +++ b/Documentation/git-push.txt
> @@ -53,7 +53,7 @@ side are updated.
>  +
>  `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
>  +
> -A parameter <ref> without a colon pushes the <ref> from the source
> +A parameter <refspec> without a colon pushes the <refspec> from the source
>  repository to the destination repository under the same name.
>  +
>  Pushing an empty <src> allows you to delete the <dst> ref from

Err... that is incorrect without further surgery. <refspec> is either
<ref>:<ref>, <ref> or some other exotic case; in the form <ref>:<ref>
it can include globbing. The fragment above talks about situation
where <refspec> is <ref>, and does not contain colon.

-- 
Jakub Narebski
Poland
ShadeHawk on #git

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2008-02-03 12:05 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-02 23:58 [PATCH] Fix spelling mistake; flagg -> flag Jörg Sommer
2008-02-02 23:58 ` [PATCH] Unify the argument of the parameter -m Jörg Sommer
2008-02-02 23:58   ` [PATCH] Unify the name of the second option in the text Jörg Sommer
2008-02-03 12:04     ` Jakub Narebski

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).