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

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
 
#ifndef MERGE_STRATEGIES_H
#define MERGE_STRATEGIES_H

#include "object.h"

int merge_strategies_one_file(struct repository *r,
			      const struct object_id *orig_blob,
			      const struct object_id *our_blob,
			      const struct object_id *their_blob, const char *path,
			      unsigned int orig_mode, unsigned int our_mode,
			      unsigned int their_mode);

typedef int (*merge_cb)(const struct object_id *orig_blob,
			const struct object_id *our_blob,
			const struct object_id *their_blob, const char *path,
			unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode,
			void *data);

int merge_one_file_cb(const struct object_id *orig_blob,
		      const struct object_id *our_blob,
		      const struct object_id *their_blob, const char *path,
		      unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode,
		      void *data);

int merge_program_cb(const struct object_id *orig_blob,
		     const struct object_id *our_blob,
		     const struct object_id *their_blob, const char *path,
		     unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode,
		     void *data);

int merge_one_path(struct index_state *istate, int oneshot, int quiet,
		   const char *path, merge_cb cb, void *data);
int merge_all(struct index_state *istate, int oneshot, int quiet,
	      merge_cb cb, void *data);

#endif /* MERGE_STRATEGIES_H */
debug log:

solving 40e175ca39 ...
found 40e175ca39 in https://public-inbox.org/git/20201005122646.27994-5-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20200901105705.6059-5-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20200625121953.16991-9-alban.gruin@gmail.com/
found cf78d7eaf4 in https://public-inbox.org/git/20201005122646.27994-4-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20200901105705.6059-4-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20200625121953.16991-7-alban.gruin@gmail.com/
found b527d145c7 in https://public-inbox.org/git/20200625121953.16991-6-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20200901105705.6059-3-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20201005122646.27994-3-alban.gruin@gmail.com/

applying [1/9] https://public-inbox.org/git/20200625121953.16991-6-alban.gruin@gmail.com/
diff --git a/merge-strategies.h b/merge-strategies.h
new file mode 100644
index 0000000000..b527d145c7

Checking patch merge-strategies.h...
Applied patch merge-strategies.h cleanly.

skipping https://public-inbox.org/git/20200901105705.6059-3-alban.gruin@gmail.com/ for b527d145c7
skipping https://public-inbox.org/git/20201005122646.27994-3-alban.gruin@gmail.com/ for b527d145c7
index at:
100644 b527d145c74855126849a996986efe3d62856907	merge-strategies.h

applying [2/9] https://public-inbox.org/git/20201005122646.27994-4-alban.gruin@gmail.com/
diff --git a/merge-strategies.h b/merge-strategies.h
index b527d145c7..cf78d7eaf4 100644

Checking patch merge-strategies.h...
Applied patch merge-strategies.h cleanly.

skipping https://public-inbox.org/git/20200901105705.6059-4-alban.gruin@gmail.com/ for cf78d7eaf4
skipping https://public-inbox.org/git/20200625121953.16991-7-alban.gruin@gmail.com/ for cf78d7eaf4
index at:
100644 cf78d7eaf462c3e78991c3070bf27d7ba7757e05	merge-strategies.h

applying [3/9] https://public-inbox.org/git/20201005122646.27994-5-alban.gruin@gmail.com/
diff --git a/merge-strategies.h b/merge-strategies.h
index cf78d7eaf4..40e175ca39 100644

Checking patch merge-strategies.h...
Applied patch merge-strategies.h cleanly.

skipping https://public-inbox.org/git/20200901105705.6059-5-alban.gruin@gmail.com/ for 40e175ca39
skipping https://public-inbox.org/git/20200625121953.16991-9-alban.gruin@gmail.com/ for 40e175ca39
index at:
100644 40e175ca391811aa6be5f24080126bff0d424d9c	merge-strategies.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).