Skip to main content

Browse the archive

https://github.com/git/git
17 August 2024, 03:29:52 UTC
Revision ac83bc5054c2ac489166072334b4147ce6d0fccb authored by Junio C Hamano on 04 August 2023, 17:01:45 UTC, committed by Junio C Hamano on 04 August 2023, 17:52:31 UTC 
Git 2.42-rc0
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 65e25ae
Raw File
Tip revision: ac83bc5054c2ac489166072334b4147ce6d0fccb authored by Junio C Hamano on 04 August 2023, 17:01:45 UTC
Git 2.42-rc0
Tip revision: ac83bc5
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