Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/rerere'
[gitweb.git]
/
rerere.h
diff --git
a/rerere.h
b/rerere.h
index ce545d0c045b3df6f2ab723638fe7df081aadf30..1222e91921882b41ac9c1648960eca9305b27d8d 100644
(file)
--- a/
rerere.h
+++ b/
rerere.h
@@
-7,6
+7,7
@@
struct pathspec;
#define RERERE_AUTOUPDATE 01
#define RERERE_NOAUTOUPDATE 02
+#define RERERE_READONLY 04
/*
* Marks paths that have been hand-resolved and added to the