Skip to main content

Browse the archive

https://github.com/git/git
17 August 2024, 03:29:52 UTC
Revision 3a19048ce498d519bd564c9fd222161dca789321 authored by Johannes Schindelin on 11 March 2023, 19:29:33 UTC, committed by Johannes Schindelin on 17 April 2023, 19:15:54 UTC 
Git 2.33.8
 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent bcd874d
Raw File
Tip revision: 3a19048ce498d519bd564c9fd222161dca789321 authored by Johannes Schindelin on 11 March 2023, 19:29:33 UTC
Git 2.33.8
Tip revision: 3a19048
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