Skip to main content

Browse the archive

Staging
v0.8.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 9da6f0fff2d6ab4bfad36099b53c911bc498fc2e authored by SZEDER Gábor on 02 September 2008, 01:35:24 UTC, committed by Junio C Hamano on 02 September 2008, 05:01:33 UTC 
Documentation: fix disappeared lines in 'git stash' manpage
 
Asciidoc removes lines starting with a dot when creating manpages.
Since those lines were comments in use case examples showing shell
commands, preceed those lines with a hash sign.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent d4040e0
Raw File
Tip revision: 9da6f0fff2d6ab4bfad36099b53c911bc498fc2e authored by SZEDER Gábor on 02 September 2008, 01:35:24 UTC
Documentation: fix disappeared lines in 'git stash' manpage
Tip revision: 9da6f0f
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 xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
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);
int buffer_is_binary(const char *ptr, unsigned long size);

extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line);

#endif
back to top