Merge branch 'tg/stash-untracked-with-pathspec-fix'

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 90bb659390e6df7fb51e153de662761ebe33a414..8295f92b3e63d2675b8238d6bc17e9b1fc81319a 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -126,7 +126,7 @@ static struct option builtin_fetch_options[] = {
                 N_("append to .git/FETCH_HEAD instead of overwriting")),
        OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
                   N_("path to upload pack on remote end")),
-       OPT__FORCE(&force, N_("force overwrite of local branch")),
+       OPT__FORCE(&force, N_("force overwrite of local branch"), 0),
        OPT_BOOL('m', "multiple", &multiple,
                 N_("fetch from multiple remotes")),
        OPT_SET_INT('t', "tags", &tags,