Skip to main content

Browse the archive

Revision 9bfff3ae5fdf1dcd0705056f7f9a42e81548797e authored by Junio C Hamano on 31 December 2009, 23:00:14 UTC, committed by Junio C Hamano on 31 December 2009, 23:00:14 UTC 
Merge branch 'maint-1.6.0' into maint
 
* maint-1.6.0:
  branch: die explicitly why when calling "git branch [-a|-r] branchname".
2 parent s 74fbd11 + 6e8f993
Raw File
rerere.h 
#ifndef RERERE_H
#define RERERE_H

#include "string-list.h"

extern int setup_rerere(struct string_list *);
extern int rerere(void);
extern const char *rerere_path(const char *hex, const char *file);
extern int has_rerere_resolution(const char *hex);

#endif
back to top