git/diff-merges.c

#include "git-compat-util.h"
#include "diff-merges.h"

#include "gettext.h"
#include "revision.h"

diff_merges_setup_func_t;
static void set_separate(struct rev_info *revs);

static diff_merges_setup_func_t set_to_default = …;
static int suppress_m_parsing;

static void suppress(struct rev_info *revs)
{ … }

static void common_setup(struct rev_info *revs)
{ … }

static void set_none(struct rev_info *revs)
{ … }

static void set_separate(struct rev_info *revs)
{ … }

static void set_first_parent(struct rev_info *revs)
{ … }

static void set_combined(struct rev_info *revs)
{ … }

static void set_dense_combined(struct rev_info *revs)
{ … }

static void set_remerge_diff(struct rev_info *revs)
{ … }

static diff_merges_setup_func_t func_by_opt(const char *optarg)
{ … }

static void set_diff_merges(struct rev_info *revs, const char *optarg)
{ … }

/*
 * Public functions. They are in the order they are called.
 */

int diff_merges_config(const char *value)
{ … }

void diff_merges_suppress_m_parsing(void)
{ … }

int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
{ … }

void diff_merges_suppress(struct rev_info *revs)
{ … }

void diff_merges_default_to_first_parent(struct rev_info *revs)
{ … }

void diff_merges_default_to_dense_combined(struct rev_info *revs)
{ … }

void diff_merges_set_dense_combined_if_unset(struct rev_info *revs)
{ … }

void diff_merges_setup_revs(struct rev_info *revs)
{ … }