mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-remote documentation: fix synopsis to match description
  git-am: fix type in its usage string
This commit is contained in:
Junio C Hamano
2008-02-03 16:04:37 -08:00
parent 147402a2e9 5ea55edb68
commit 3023448cef
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-remote.txt
View File

@ -10,7 +10,7 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git-remote' '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' rm <name>
'git-remote' show <name> 'git-remote' show <name>
'git-remote' prune <name> 'git-remote' prune <name>

2
git-am.sh
View File

@ -14,7 +14,7 @@ b,binary pass --allo-binary-replacement to git-apply
3,3way allow fall back on 3way merging if needed 3,3way allow fall back on 3way merging if needed
s,signoff add a Signed-off-by line to the commit message s,signoff add a Signed-off-by line to the commit message
u,utf8 recode into utf8 (default) 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 whitespace= pass it through git-apply
C= pass it through git-apply C= pass it through git-apply
p= pass it through git-apply p= pass it through git-apply