rebase: Support preserving merges in non-interactive mode

diff --git a/builtin-bundle.c b/builtin-bundle.c
index 9f38e2176a4c05fe9f6f8efcabb9b1e7204fdb85..9b58152047baebfdd6f26ffab31d49347e0cb069 100644 (file)
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -6,15 +6,15 @@
  * Basic handler for bundle files to connect repositories via sneakernet.
  * Invocation must include action.
  * This function can create a bundle or provide information on an existing
- * bundle supporting git-fetch, git-pull, and git-ls-remote
+ * bundle supporting "fetch", "pull", and "ls-remote".
  */
 
-static const char *bundle_usage="git-bundle (create <bundle> <git-rev-list args> | verify <bundle> | list-heads <bundle> [refname]... | unbundle <bundle> [refname]... )";
+static const char *bundle_usage="git bundle (create <bundle> <git rev-list args> | verify <bundle> | list-heads <bundle> [refname]... | unbundle <bundle> [refname]... )";
 
 int cmd_bundle(int argc, const char **argv, const char *prefix)
 {
        struct bundle_header header;
-       int nongit = 0;
+       int nongit;
        const char *cmd, *bundle_file;
        int bundle_fd = -1;
        char buffer[PATH_MAX];