make the files we pass to gitk explicit

diff --git a/merge_msg1 b/merge_msg1
index 737e905ec0687a1983c2f89431742eabc992bad0..0ff31709b8a71ef8deec2c2a29fb0954591b4ce1 100755 (executable)
--- a/merge_msg1
+++ b/merge_msg1
@@ -11,7 +11,7 @@ branch=${branch%%/*}
 
 contact=$(sed -n "/    $branch /s/     .*$//p" $control)
 
-gitk --merge $1 &
+gitk --merge -- $1 &
 gvim $1
 sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree&Body=Hi ,%0A\
 %0A\