Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision af6d1d602a8f64164b266364339c4e936d5bbc33 authored by Junio C Hamano on 12 October 2021, 20:51:59 UTC, committed by Junio C Hamano on 12 October 2021, 20:51:59 UTC 
Git 2.33.1
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 9e25a2e
Raw File
Tip revision: af6d1d602a8f64164b266364339c4e936d5bbc33 authored by Junio C Hamano on 12 October 2021, 20:51:59 UTC
Git 2.33.1
Tip revision: af6d1d6
diff-merges.h 
#ifndef DIFF_MERGES_H
#define DIFF_MERGES_H

/*
 * diff-merges - utility module to handle command-line options for
 * selection of particular diff format of merge commits
 * representation.
 */

struct rev_info;

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);

#endif
back to top