undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.8.1' into maint

Browse Source 
* maint-1.8.1:
  merge-tree: fix typo in merge-tree.c::unresolved
  git-commit doc: describe use of multiple `-m` options
  git-pull doc: fix grammo ("conflicts" is plural)
This commit is contained in:
Junio C Hamano 2013-03-27 10:51:10 -07:00
commit d011ab4312
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-commit.txt
View File

@ -137,6 +137,8 @@ OPTIONS
-m <msg>:: -m <msg>::
--message=<msg>:: --message=<msg>::
Use the given <msg> as the commit message. Use the given <msg> as the commit message.
If multiple `-m` options are given, their values are
concatenated as separate paragraphs.
-t <file>:: -t <file>::
--template=<file>:: --template=<file>::

2
Documentation/git-pull.txt
View File

@ -218,7 +218,7 @@ $ git merge origin/next
------------------------------------------------ ------------------------------------------------
If you tried a pull which resulted in a complex conflicts and If you tried a pull which resulted in complex conflicts and
would want to start over, you can recover with 'git reset'. would want to start over, you can recover with 'git reset'.

2
builtin/merge-tree.c
View File

@ -245,7 +245,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
unsigned dirmask = 0, mask = 0; unsigned dirmask = 0, mask = 0;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
mask |= (1 << 1); mask |= (1 << i);
if (n[i].mode && S_ISDIR(n[i].mode)) if (n[i].mode && S_ISDIR(n[i].mode))
dirmask |= (1 << i); dirmask |= (1 << i);
} }