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:
e893f7a
4415278
)
Merge branch 'jc/combined'
author
Junio C Hamano
<junkio@cox.net>
Thu, 26 Oct 2006 09:07:18 +0000
(
02:07
-0700)
committer
Junio C Hamano
<junkio@cox.net>
Thu, 26 Oct 2006 09:07:18 +0000
(
02:07
-0700)
* jc/combined:
combine-diff: honour --no-commit-id
combine-diff: fix hunk_comment_line logic.
1
2
combine-diff.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
combine-diff.c
Simple merge