projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 74b2428) | patch
Ass a "merge-cache" helper program to execute a merge on
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Apr 2005 02:52:54 +0000 (19:52 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Apr 2005 02:52:54 +0000 (19:52 -0700)
commit75118b13bc8187c629886b108929f996c47daf01
tree7a191717f2b03af0ac1978e9cfc19826836f5c3ctree | snapshot
parent74b2428f5573b1f68ce717706296ae7d1832cd65commit | diff
Ass a "merge-cache" helper program to execute a merge on
any unmerged files.

This one doesn't actually do the merging, but it makes it
easy to script the programs that do using it.
Makefile diff | blob | history
merge-cache.c [new file with mode: 0644] blob
The core git plumbing