Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/apply'
author
Junio C Hamano
<junkio@cox.net>
Wed, 17 May 2006 22:47:33 +0000
(15:47 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 17 May 2006 22:47:33 +0000
(15:47 -0700)
* jc/apply:
git-am: use apply --cached
apply --cached: apply a patch without using working tree.
apply --numstat: show new name, not old name.
1
2
git-am.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
63dffdf
b762727
)
diff --cc
git-am.sh
Simple merge