Merge branch 'jt/diff-color-move-fix' into next

diff --git a/path.c b/path.c
index e485f9f93181778de3acfe3cd4b6811ec82c7940..e50d2befcf826680c70ac59295c06004dd6221cf 100644 (file)
--- a/path.c
+++ b/path.c
@@ -1321,6 +1321,11 @@ int is_ntfs_dotgit(const char *name)
                }
 }
 
+int looks_like_command_line_option(const char *str)
+{
+       return str && str[0] == '-';
+}
+
 char *xdg_config_home(const char *filename)
 {
        const char *home, *config_home;