Skip to main content

Browse the archive

Revision adda3c3beb0a244719becb1895e16227b0393bd1 authored by Marc Branchaud on 12 April 2010, 16:28:13 UTC, committed by Junio C Hamano on 12 April 2010, 16:50:09 UTC 
Docs: Add -X option to git-merge's synopsis.
 
Also move -X's description next to -s's in merge-options.txt.

This makes it easier to learn how to specify merge strategy options.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent fcd4240
Raw File
pack-revindex.h 
#ifndef PACK_REVINDEX_H
#define PACK_REVINDEX_H

struct revindex_entry {
	off_t offset;
	unsigned int nr;
};

struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs);
void discard_revindex(void);

#endif
back to top