diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-21 12:02:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-21 12:02:44 -0800 |
| commit | e443bdfe1e8e1ef8b3665cfd1c1295bd73e13773 (patch) | |
| tree | fdea418b083f7185f08b51d04f49081fc1c58c54 /builtin | |
| parent | 3daff7c31998faedbe0dd7e2b8651e351be40d64 (diff) | |
| parent | 2ce0edcd786b790fed580e7df56291619834d276 (diff) | |
| download | git-e443bdfe1e8e1ef8b3665cfd1c1295bd73e13773.tar.gz git-e443bdfe1e8e1ef8b3665cfd1c1295bd73e13773.tar.xz | |
Sync with v1.7.8.1
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clone.c | 4 | ||||
| -rw-r--r-- | builtin/commit.c | 2 | ||||
| -rw-r--r-- | builtin/log.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index efe8b6cce..86db95473 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -84,8 +84,8 @@ static struct option builtin_clone_options[] = { "directory from which templates will be used"), OPT_CALLBACK(0 , "reference", &option_reference, "repo", "reference repository", &opt_parse_reference), - OPT_STRING('o', "origin", &option_origin, "branch", - "use <branch> instead of 'origin' to track upstream"), + OPT_STRING('o', "origin", &option_origin, "name", + "use <name> instead of 'origin' to track upstream"), OPT_STRING('b', "branch", &option_branch, "branch", "checkout <branch> instead of the remote's HEAD"), OPT_STRING('u', "upload-pack", &option_upload_pack, "path", diff --git a/builtin/commit.c b/builtin/commit.c index 626036a17..be1ab2e25 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -139,7 +139,7 @@ static struct option builtin_commit_options[] = { OPT_STRING('C', "reuse-message", &use_message, "commit", "reuse message from specified commit"), OPT_STRING(0, "fixup", &fixup_message, "commit", "use autosquash formatted message to fixup specified commit"), OPT_STRING(0, "squash", &squash_message, "commit", "use autosquash formatted message to squash specified commit"), - OPT_BOOLEAN(0, "reset-author", &renew_authorship, "the commit is authored by me now (used with -C-c/--amend)"), + OPT_BOOLEAN(0, "reset-author", &renew_authorship, "the commit is authored by me now (used with -C/-c/--amend)"), OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"), OPT_FILENAME('t', "template", &template_file, "use specified template file"), OPT_BOOL('e', "edit", &edit_flag, "force edit of commit"), diff --git a/builtin/log.c b/builtin/log.c index 89d0cc013..7d1f6f88a 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -73,8 +73,6 @@ static int decorate_callback(const struct option *opt, const char *arg, int unse static void cmd_log_init_defaults(struct rev_info *rev) { - rev->abbrev = DEFAULT_ABBREV; - rev->commit_format = CMIT_FMT_DEFAULT; if (fmt_pretty) get_commit_format(fmt_pretty, rev); rev->verbose_header = 1; |