]> git.ipfire.org Git - thirdparty/git.git/commit - git-merge-one-file.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e0226ad) | patch
One more time.. Clean up git-merge-one-file-script
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 9 Jun 2005 00:56:09 +0000 (17:56 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 9 Jun 2005 00:56:09 +0000 (17:56 -0700)
commit98a96b00b88ee35866cd0b1e94697db76bd5ddf9
tree927deeddf147d85e94c0c6de56e5ad2c57d0a164tree | snapshot
parente0226add28e53a35ce91cdbebb1919519f02b291commit | diff
One more time.. Clean up git-merge-one-file-script

This uses git-checkout-file to make sure that the full pathname is
created, instead of the script having to verify it by hand.  Also,
simplify the 3-way merge case by just writing to the right file and
setting the initial index contents early.
git-merge-one-file-script diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.