Revision d23e7570a764d5e3fd033b7586bb4924d2774370 authored by Ian Ward Comfort on 17 March 2010, 09:20:35 UTC, committed by Junio C Hamano on 17 March 2010, 18:03:44 UTC
We already complete HEAD, of course, and might as well complete the other
common refs mentioned in the rev-parse man page: FETCH_HEAD, ORIG_HEAD, and
MERGE_HEAD.

Signed-off-by: Ian Ward Comfort <icomfort@stanford.edu>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 7325283
Raw File
userdiff.h
#ifndef USERDIFF_H
#define USERDIFF_H

struct userdiff_funcname {
	const char *pattern;
	int cflags;
};

struct userdiff_driver {
	const char *name;
	const char *external;
	int binary;
	struct userdiff_funcname funcname;
	const char *word_regex;
	const char *textconv;
};

int userdiff_config(const char *k, const char *v);
struct userdiff_driver *userdiff_find_by_name(const char *name);
struct userdiff_driver *userdiff_find_by_path(const char *path);

#endif /* USERDIFF */
back to top