projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 769f398) | patch
mergetool: fix emerge when running in a subdirectory
authorTheodore Ts'o <tytso@mit.edu>
Sat, 29 Sep 2007 01:23:22 +0000 (21:23 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sat, 29 Sep 2007 01:23:22 +0000 (21:23 -0400)
commitf6e0e559340af6e300b63da061fa05ff07e3d6f6
tree1d4275f2675e618cb31043def600524ff5d5545atree | snapshot
parent769f39861b73a374f116fcb913e5ff276fe92751commit | diff
mergetool: fix emerge when running in a subdirectory

Only pass the basename of the output filename when to emerge, since
emerge interprets non-absolute pathnames relative to the containing
directory of the output buffer.

Thanks to Kelvie Wong for pointing this out.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
git-mergetool.sh diff | blob | history
Git—the stupid content tracker