projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6a0dbb8
7d0c688
)
Merge branch 'jc/squash'
author
Junio C Hamano
<junkio@cox.net>
Mon, 26 Jun 2006 21:36:10 +0000
(14:36 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Mon, 26 Jun 2006 21:36:10 +0000
(14:36 -0700)
* jc/squash:
git-merge --squash
1
2
git-commit.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
git-commit.sh
Simple merge