git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
432bcb55c425605f956532537375646d78baab80 blob 455 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
 
#ifndef REBASE_H
#define REBASE_H

enum rebase_type {
	REBASE_INVALID = -1,
	REBASE_DEFAULT = 0,
	REBASE_FALSE,
	REBASE_TRUE,
	REBASE_PRESERVE,
	REBASE_MERGES,
	REBASE_INTERACTIVE
};

enum rebase_type rebase_parse_value(const char *value);

enum pull_mode_type {
	PULL_MODE_INVALID = -1,
	PULL_MODE_DEFAULT = 0,
	PULL_MODE_MERGE,
	PULL_MODE_REBASE,
	PULL_MODE_FF_ONLY
};

enum pull_mode_type pull_mode_parse_value(const char *value);

#endif /* REBASE */
debug log:

solving 432bcb55c4 ...
found 432bcb55c4 in https://public-inbox.org/git/20201208002648.1370414-18-felipe.contreras@gmail.com/ ||
	https://public-inbox.org/git/20201125032938.786393-10-felipe.contreras@gmail.com/
found 5ab8f4ddd5 in https://public-inbox.org/git/20210705123209.1808663-27-felipe.contreras@gmail.com/ ||
	https://public-inbox.org/git/20201125032938.786393-9-felipe.contreras@gmail.com/ ||
	https://public-inbox.org/git/20201208002648.1370414-17-felipe.contreras@gmail.com/ ||
	https://public-inbox.org/git/20201218211026.1937168-11-felipe.contreras@gmail.com/
found 34d4acfd74 in https://public-inbox.org/git/20201125032938.786393-8-felipe.contreras@gmail.com/ ||
	https://public-inbox.org/git/20210705123209.1808663-24-felipe.contreras@gmail.com/ ||
	https://public-inbox.org/git/20201218211026.1937168-8-felipe.contreras@gmail.com/ ||
	https://public-inbox.org/git/20201205195313.1557473-12-felipe.contreras@gmail.com/ ||
	https://public-inbox.org/git/20201208002648.1370414-12-felipe.contreras@gmail.com/ ||
	https://public-inbox.org/git/20201205195313.1557473-1-felipe.contreras@gmail.com/
found cc723d4748 in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100644 cc723d4748952e4cf5e83b0b8835d2fd576dcf71	rebase.h

applying [1/12] https://public-inbox.org/git/20201125032938.786393-8-felipe.contreras@gmail.com/
diff --git a/rebase.h b/rebase.h
index cc723d4748..34d4acfd74 100644

Checking patch rebase.h...
Applied patch rebase.h cleanly.

skipping https://public-inbox.org/git/20210705123209.1808663-24-felipe.contreras@gmail.com/ for 34d4acfd74
skipping https://public-inbox.org/git/20201218211026.1937168-8-felipe.contreras@gmail.com/ for 34d4acfd74
skipping https://public-inbox.org/git/20201205195313.1557473-12-felipe.contreras@gmail.com/ for 34d4acfd74
skipping https://public-inbox.org/git/20201208002648.1370414-12-felipe.contreras@gmail.com/ for 34d4acfd74
skipping https://public-inbox.org/git/20201205195313.1557473-1-felipe.contreras@gmail.com/ for 34d4acfd74
index at:
100644 34d4acfd74c6b74d8298973b93bbbe438e4ce1bb	rebase.h

applying [2/12] https://public-inbox.org/git/20210705123209.1808663-27-felipe.contreras@gmail.com/
diff --git a/rebase.h b/rebase.h
index 34d4acfd74..5ab8f4ddd5 100644

Checking patch rebase.h...
Applied patch rebase.h cleanly.

skipping https://public-inbox.org/git/20201125032938.786393-9-felipe.contreras@gmail.com/ for 5ab8f4ddd5
skipping https://public-inbox.org/git/20201208002648.1370414-17-felipe.contreras@gmail.com/ for 5ab8f4ddd5
skipping https://public-inbox.org/git/20201218211026.1937168-11-felipe.contreras@gmail.com/ for 5ab8f4ddd5
index at:
100644 5ab8f4ddd5b0b504294d9447b9bfd4b52f963bce	rebase.h

applying [3/12] https://public-inbox.org/git/20201208002648.1370414-18-felipe.contreras@gmail.com/
diff --git a/rebase.h b/rebase.h
index 5ab8f4ddd5..432bcb55c4 100644

Checking patch rebase.h...
Applied patch rebase.h cleanly.

skipping https://public-inbox.org/git/20201125032938.786393-10-felipe.contreras@gmail.com/ for 432bcb55c4
index at:
100644 432bcb55c425605f956532537375646d78baab80	rebase.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).