On Fri, Apr 3, 2015 at 9:21 PM, Koosha Khajehmoogahi <koosha@xxxxxxxxx> wrote:
> From: Junio C Hamano <gitster@xxxxxxxxx>
>
> [kk: wrote commit message]
>
> Helped-by: Eris Sunshine <sunshine@xxxxxxxxxxxxxx>
s/Eris/Eric/
> Signed-off-by: Koosha Khajehmoogahi <koosha@xxxxxxxxx>
> ---
> builtin/log.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/builtin/log.c b/builtin/log.c
> index dd8f3fc..c7a7aad 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -36,6 +36,7 @@ static int decoration_given;
> static int use_mailmap_config;
> static const char *fmt_patch_subject_prefix = "PATCH";
> static const char *fmt_pretty;
> +static const char *log_merges;
>
> static const char * const builtin_log_usage[] = {
> N_("git log [<options>] [<revision range>] [[--] <path>...]"),
> @@ -386,6 +387,9 @@ static int git_log_config(const char *var, const char *value, void *cb)
> decoration_style = 0; /* maybe warn? */
> return 0;
> }
> + if (!strcmp(var, "log.merges")) {
> + return git_config_string(&log_merges, var, value);
> + }
> if (!strcmp(var, "log.showroot")) {
> default_show_root = git_config_bool(var, value);
> return 0;
> @@ -628,6 +632,8 @@ int cmd_log(int argc, const char **argv, const char *prefix)
>
> init_revisions(&rev, prefix);
> rev.always_show_header = 1;
> + if (log_merges && parse_merges_opt(&rev, log_merges))
> + die("unknown config value for log.merges: %s", log_merges);
> memset(&opt, 0, sizeof(opt));
> opt.def = "HEAD";
> opt.revarg_opt = REVARG_COMMITTISH;
> --
> 2.3.3.263.g095251d.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html