Skip to main content

Browse the archive

Revision 1ecef023a9b89056d7070662dd0541481b54a7dc authored by Jiang Xin on 05 March 2021, 05:47:07 UTC, committed by Jiang Xin on 05 March 2021, 05:47:07 UTC 
Merge branch 'fr_next' of github.com:jnavila/git
 
* 'fr_next' of github.com:jnavila/git:
  l10n: fr: v2.31 rnd 2
2 parent s 5b888ad + 068cb92
Raw File
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_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