Skip to main content

Browse the archive

https://github.com/git/git
10 July 2024, 17:47:24 UTC
Revision 786a3e4b8d754d2b14b1208b98eeb0a554ef19a8 authored by Junio C Hamano on 29 April 2024, 14:30:29 UTC, committed by Junio C Hamano on 29 April 2024, 14:30:29 UTC 
Git 2.45
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent f4edad9
Raw File
Tip revision: 786a3e4b8d754d2b14b1208b98eeb0a554ef19a8 authored by Junio C Hamano on 29 April 2024, 14:30:29 UTC
Git 2.45
Tip revision: 786a3e4
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