git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
ae1cc8ef9410049cd17e41ec98bfe87bb93069a9 blob 501 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
 
#ifndef DIFF_MERGES_H
#define DIFF_MERGES_H

struct rev_info;

void diff_merges_init_revs(struct rev_info *revs);

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
debug log:

solving ae1cc8ef9410 ...
found ae1cc8ef9410 in https://public-inbox.org/git/20201101193330.24775-12-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-12-sorganov@gmail.com/
found 32720bc9b40f in https://public-inbox.org/git/20201101193330.24775-11-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-11-sorganov@gmail.com/
found 4b023c385d00 in https://public-inbox.org/git/20201101193330.24775-10-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-10-sorganov@gmail.com/
found 20b727bd734f in https://public-inbox.org/git/20201101193330.24775-9-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-9-sorganov@gmail.com/
found cf411414898d in https://public-inbox.org/git/20201101193330.24775-8-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-8-sorganov@gmail.com/
found 648c410497cb in https://public-inbox.org/git/20201101193330.24775-7-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-7-sorganov@gmail.com/
found e0cca3d935d3 in https://public-inbox.org/git/20201101193330.24775-6-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-6-sorganov@gmail.com/

applying [1/14] https://public-inbox.org/git/20201101193330.24775-6-sorganov@gmail.com/
diff --git a/diff-merges.h b/diff-merges.h
new file mode 100644
index 000000000000..e0cca3d935d3

Checking patch diff-merges.h...
Applied patch diff-merges.h cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-6-sorganov@gmail.com/ for e0cca3d935d3
index at:
100644 e0cca3d935d3017e9ec34516451b82de40ec8629	diff-merges.h

applying [2/14] https://public-inbox.org/git/20201101193330.24775-7-sorganov@gmail.com/
diff --git a/diff-merges.h b/diff-merges.h
index e0cca3d935d3..648c410497cb 100644

Checking patch diff-merges.h...
Applied patch diff-merges.h cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-7-sorganov@gmail.com/ for 648c410497cb
index at:
100644 648c410497cb20666048f4cd3da1cd804bf183a4	diff-merges.h

applying [3/14] https://public-inbox.org/git/20201101193330.24775-8-sorganov@gmail.com/
diff --git a/diff-merges.h b/diff-merges.h
index 648c410497cb..cf411414898d 100644

Checking patch diff-merges.h...
Applied patch diff-merges.h cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-8-sorganov@gmail.com/ for cf411414898d
index at:
100644 cf411414898df0a39c30e40b7af7ab4fde50b95f	diff-merges.h

applying [4/14] https://public-inbox.org/git/20201101193330.24775-9-sorganov@gmail.com/
diff --git a/diff-merges.h b/diff-merges.h
index cf411414898d..20b727bd734f 100644

Checking patch diff-merges.h...
Applied patch diff-merges.h cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-9-sorganov@gmail.com/ for 20b727bd734f
index at:
100644 20b727bd734ff576ea19a1b7c9601ae28cc49cdc	diff-merges.h

applying [5/14] https://public-inbox.org/git/20201101193330.24775-10-sorganov@gmail.com/
diff --git a/diff-merges.h b/diff-merges.h
index 20b727bd734f..4b023c385d00 100644

Checking patch diff-merges.h...
Applied patch diff-merges.h cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-10-sorganov@gmail.com/ for 4b023c385d00
index at:
100644 4b023c385d00bcf39d0705cf72d5cd6d0bc212ff	diff-merges.h

applying [6/14] https://public-inbox.org/git/20201101193330.24775-11-sorganov@gmail.com/
diff --git a/diff-merges.h b/diff-merges.h
index 4b023c385d00..32720bc9b40f 100644

Checking patch diff-merges.h...
Applied patch diff-merges.h cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-11-sorganov@gmail.com/ for 32720bc9b40f
index at:
100644 32720bc9b40fe6de6dacfaee44d8d15cc97cf559	diff-merges.h

applying [7/14] https://public-inbox.org/git/20201101193330.24775-12-sorganov@gmail.com/
diff --git a/diff-merges.h b/diff-merges.h
index 32720bc9b40f..ae1cc8ef9410 100644

Checking patch diff-merges.h...
Applied patch diff-merges.h cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-12-sorganov@gmail.com/ for ae1cc8ef9410
index at:
100644 ae1cc8ef9410049cd17e41ec98bfe87bb93069a9	diff-merges.h

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).