diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-04 03:04:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-04 03:04:37 +0300 |
| commit | 3023448cef6e85bdc1ce98226f23d63128c5c9a1 (patch) | |
| tree | 3a276a9a3d211096fe2f096b1d225eeb4b215be7 | |
| parent | 147402a2e9e29efe3fe75b5409cc2dd88cef04c7 (diff) | |
| parent | 5ea55edb68f488fad76c007472830cc649e3d320 (diff) | |
Merge branch 'maint'
* maint:
git-remote documentation: fix synopsis to match description
git-am: fix type in its usage string
| -rw-r--r-- | Documentation/git-remote.txt | 2 | ||||
| -rwxr-xr-x | git-am.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 10f6fa58bf..2cbd1f764b 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> @@ -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 |