Make command line parsing more compatible with gitk