projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 566487c) | patch
Fix up git-merge-one-file-script
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 9 Jun 2005 00:36:47 +0000 (17:36 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 9 Jun 2005 00:36:47 +0000 (17:36 -0700)
commite0226add28e53a35ce91cdbebb1919519f02b291
tree162a7930fe8651b77fb544afba4a3a636aa8a55etree | snapshot
parent566487c8a617c12d68bf22c7078bce0b94fc8121commit | diff
Fix up git-merge-one-file-script

Junio points out that we may need to create the path leading
up the the file we merge.

And we need to be more careful with the "exec"s we've done
to exit on success - only do the on the last command in the
pipeline, not the first one ;)
git-merge-one-file-script diff | blob | history
The core git plumbing