threads / patch / 11849

patchUnify the argument of the parameter -m

Subject: [PATCH] Unify the argument of the parameter -m

## tl;dr

4 messages between Feb 2, 2008 and Feb 3, 2008. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Jörg Sommer· Feb 2, 2008, 23:58 UTC · lore

[PATCH] Fix spelling mistake; flagg -> flag

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

Show changes to git-am.sh +1 −1

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

Jörg Sommer· Feb 2, 2008, 23:58 UTC · re: Jörg Sommer · lore

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

Show changes to Documentation/git-remote.txt +1 −1

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

Jörg Sommer· Feb 2, 2008, 23:58 UTC · re: Jörg Sommer · lore

[PATCH] Unify the name of the second option in the text

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

Show changes to Documentation/git-push.txt +1 −1

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

Jakub Narebski· Feb 3, 2008, 12:04 UTC · re: Jörg Sommer · lore

Re: [PATCH] Unify the name of the second option in the text

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

Show 18 quoted lines

> 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