projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0dfa2c2) | patch
Add temporary dir/file for htools import
authorIustin Pop <iustin@google.com>
Thu, 17 Mar 2011 10:06:20 +0000 (11:06 +0100)
committerIustin Pop <iustin@google.com>
Thu, 17 Mar 2011 15:29:39 +0000 (16:29 +0100)
commit8bc9e04a21457c4188475dc849d0d7d1e22ee929
tree3e831e2dd59bd799241e0cb50727d2239c908e16tree | snapshot
parent0dfa2c2271131bd9b6e0409f642b4e094827c871commit | diff
Add temporary dir/file for htools import

In order for “git merge -s recursive -X subtree=htools” to do its
magic, an (mostly empty) directory must exist in the target tree name
‘htools’. Hence we add a temp file to it before the merge, and remove
it after that.

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
htools/.temp [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.