diff options
author | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:34:36 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:35:14 -0700 |
commit | eed94a570e0421175d6b4342c0ac48e03ceedf0b (patch) | |
tree | f33864f2abffdcb83cbf626b26da34f9cc8d5bab /.gitignore | |
parent | discard_cache(): discard index, even if no file was mmap()ed (diff) | |
parent | GIT 1.4.2 (diff) | |
download | tgif-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.xz |
Merge branch 'master' into js/c-merge-recursive
Adjust to hold_lock_file_for_update() change on the master.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions