OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c257bbb
5e5ffa0
)
Merge branch 'ns/merge-recursive-uptodate'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 15 Jul 2010 19:08:11 +0000
(12:08 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 15 Jul 2010 19:08:11 +0000
(12:08 -0700)
* ns/merge-recursive-uptodate:
merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
Trivial merge