pull: support pull.ff config

diff --git a/builtin/log.c b/builtin/log.c
index fb61c08ee5ee1fa55c73403baddc7117e8a918b9..e67671e37ab51d49424bb9a8945901dc9f9776ed 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -38,7 +38,7 @@ static const char *fmt_patch_subject_prefix = "PATCH";
 static const char *fmt_pretty;
 
 static const char * const builtin_log_usage[] = {
-       N_("git log [<options>] [<revision range>] [[--] <path>...]"),
+       N_("git log [<options>] [<revision-range>] [[--] <path>...]"),
        N_("git show [<options>] <object>..."),
        NULL
 };
@@ -1632,7 +1632,7 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
                break;
        default:
                current_branch = branch_get(NULL);
-               upstream = branch_get_upstream(current_branch);
+               upstream = branch_get_upstream(current_branch, NULL);
                if (!upstream) {
                        fprintf(stderr, _("Could not find a tracked"
                                        " remote branch, please"