File: merge.h

package info (click to toggle)
git 1%3A2.51.0-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 61,616 kB
  • sloc: ansic: 304,617; sh: 259,866; perl: 25,871; tcl: 21,754; makefile: 4,158; python: 3,442; javascript: 772; csh: 45
file content (17 lines) | stat: -rw-r--r-- 446 bytes parent folder | download | duplicates (7) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
 
#ifndef MERGE_H
#define MERGE_H

struct commit_list;
struct object_id;
struct repository;

int try_merge_command(struct repository *r,
		const char *strategy, size_t xopts_nr,
		const char **xopts, struct commit_list *common,
		const char *head_arg, struct commit_list *remotes);
int checkout_fast_forward(struct repository *r,
			  const struct object_id *from,
			  const struct object_id *to,
			  int overwrite_ignore);

#endif /* MERGE_H */