diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-04-07 02:26:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-07 02:26:24 -0700 |
| commit | ee9693e246669f48f6b058a1044cefa973a44c22 (patch) | |
| tree | 80f0985cb14b578e9d13c04ad39a47dd8eccb3a2 /cache.h | |
| parent | Merge branch 'fp/make-j' (diff) | |
| parent | git-read-tree --index-output=<file> (diff) | |
| download | tgif-ee9693e246669f48f6b058a1044cefa973a44c22.tar.xz | |
Merge branch 'jc/index-output'
* jc/index-output:
git-read-tree --index-output=<file>
_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
Conflicts:
builtin-apply.c
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -211,6 +211,11 @@ struct lock_file { }; extern int hold_lock_file_for_update(struct lock_file *, const char *path, int); extern int commit_lock_file(struct lock_file *); + +extern int hold_locked_index(struct lock_file *, int); +extern int commit_locked_index(struct lock_file *); +extern void set_alternate_index_output(const char *); + extern void rollback_lock_file(struct lock_file *); extern int delete_ref(const char *, unsigned char *sha1); |