https://github.com/git/git
Revision 27dca07fb77f6f5851e3a8de54f86c803358caa4 authored by Uwe Kleine-König on 23 January 2007, 08:20:17 UTC, committed by Junio C Hamano on 25 January 2007, 00:12:15 UTC
Just some option name disambiguation.  This is the counter part to
commit d23842fd which made a similar change for push and send-pack.

--exec continues to work.

Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 497171e
Raw File
Tip revision: 27dca07fb77f6f5851e3a8de54f86c803358caa4 authored by Uwe Kleine-König on 23 January 2007, 08:20:17 UTC
rename --exec to --upload-pack for fetch-pack and peek-remote
Tip revision: 27dca07
xdiff-interface.h
#ifndef XDIFF_INTERFACE_H
#define XDIFF_INTERFACE_H

#include "xdiff/xdiff.h"

struct xdiff_emit_state;

typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);

struct xdiff_emit_state {
	xdiff_emit_consume_fn consume;
	char *remainder;
	unsigned long remainder_size;
};

int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
int parse_hunk_header(char *line, int len,
		      int *ob, int *on,
		      int *nb, int *nn);
int read_mmfile(mmfile_t *ptr, const char *filename);

#endif
back to top