diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 15:19:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 21:47:30 (GMT) |
| commit | a37eec6333db6f38edd21e74812d6c5f215b6e6c (patch) | |
| tree | 6089be4d5a751e62fdbeb9642f3e67f721d622f1 /diff-merges.h | |
| parent | 3d4fd9436337d1688e7e2c2b2da4f7b7e3e8591e (diff) | |
| download | git-a37eec6333db6f38edd21e74812d6c5f215b6e6c.zip git-a37eec6333db6f38edd21e74812d6c5f215b6e6c.tar.gz git-a37eec6333db6f38edd21e74812d6c5f215b6e6c.tar.bz2 | |
revision: move diff merges functions to its own diff-merges.c
Create separate diff-merges.c and diff-merges.h files, and move all
the code related to handling of diff merges there.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-merges.h')
| -rw-r--r-- | diff-merges.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/diff-merges.h b/diff-merges.h new file mode 100644 index 0000000..7e970b2 --- /dev/null +++ b/diff-merges.h @@ -0,0 +1,18 @@ +#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; + +void init_diff_merge_revs(struct rev_info *revs); +int parse_diff_merge_opts(struct rev_info *revs, const char **argv); +void setup_diff_merges_revs(struct rev_info *revs); +void rev_diff_merges_default_to_dense_combined(struct rev_info *revs); +void rev_diff_merges_first_parent_defaults_to_enable(struct rev_info *revs); + +#endif |