Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge remote branch 'origin/master'
author
Avery Pennarun
<apenwarr@gmail.com>
Thu, 24 Jun 2010 06:11:04 +0000
(
02:11
-0400)
committer
Avery Pennarun
<apenwarr@gmail.com>
Thu, 24 Jun 2010 06:11:04 +0000
(
02:11
-0400)
* origin/master:
Fixed regression with splitting out new subtree
Use 'git merge -Xsubtree' when git version >= 1.7.0.
1
2
git-subtree.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
9c632ea
39f5fff
)
diff --cc
git-subtree.sh
Simple merge