Show a failure of rebase -p if the merge had a conflict

diff --git a/builtin-ls-remote.c b/builtin-ls-remote.c
index 06ab8da1fb1e5ebc5fedb82e74d7e6a7374cee0e..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