Andrew's git / gitweb.git / diff
?
Merge branch 'nd/gc-lock-against-each-other'
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 Sep 2013 19:35:34 +0000 (12:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Sep 2013 19:35:34 +0000 (12:35 -0700)
* nd/gc-lock-against-each-other:
gc: reject if another gc is running, unless --force is given

1  2 
Documentation/git-gc.txt patch | diff1 | diff2 | blob | history
compat/mingw.c patch | diff1 | diff2 | blob | history
diff --cc Documentation/git-gc.txt
Simple merge
diff --cc compat/mingw.c
Simple merge