Skip to main content

Browse the archive

Revision 21bb3851ee3c6fe945ed17c10b79dc153418fcdf authored by Junio C Hamano on 13 June 2022, 22:53:44 UTC, committed by Junio C Hamano on 13 June 2022, 22:53:44 UTC 
Merge branch 'gc/document-config-worktree-scope'
 
Doc update.

* gc/document-config-worktree-scope:
  config: document and test the 'worktree' scope
2 parent s da48270 + db7961e
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_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