modify/delete conflict resolution overwrites untracked file

[git.git] / builtin-ls-remote.c

diff --git a/builtin-ls-remote.c b/builtin-ls-remote.c
index 8907a89d6c3914f4652ef387776f581015778396..78a88f74769645f0be86aa77d3dee3f5e99c916f 100644 (file)
--- a/builtin-ls-remote.c
+++ b/builtin-ls-remote.c
@@ -4,7 +4,7 @@
 #include "remote.h"
 
 static const char ls_remote_usage[] =
-"git-ls-remote [--upload-pack=<git-upload-pack>] [<host>:]<directory>";
+"git ls-remote [--heads] [--tags]  [-u <exec> | --upload-pack <exec>] <repository> <refs>...";
 
 /*
  * Is there one among the list of patterns that match the tail part
@@ -31,7 +31,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 {
        int i;
        const char *dest = NULL;
-       int nongit = 0;
+       int nongit;
        unsigned flags = 0;
        const char *uploadpack = NULL;
        const char **pattern = NULL;