| commit | a660534e06147f8867d6c9b6c41025427a7b5c6c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 May 2010 11:02:18 +0000 (21 04:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 May 2010 11:02:18 +0000 (21 04:02 -0700) | ||
| tree | 0ba8f85b478e0642ee775df82a94c3640217d756 | treesnapshot (tar.gz zip) |
| parent | 455bda993cceb42921c9ff173da26651f1d66602 | commitdiff |
| parent | 03cb91b18cc7f9c19c053c97711f592cebddb5f4 | commitdiff |
Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'
* jc/maint-no-reflog-expire-unreach-for-head:
reflog --expire-unreachable: special case entries in "HEAD" reflog
more war on "sleep" in tests
Document gc.<pattern>.reflogexpire variables
Conflicts:
Documentation/config.txt
* jc/maint-no-reflog-expire-unreach-for-head:
reflog --expire-unreachable: special case entries in "HEAD" reflog
more war on "sleep" in tests
Document gc.<pattern>.reflogexpire variables
Conflicts:
Documentation/config.txt
| Documentation/config.txt | diff1 | diff2 | blobhistory |
| Documentation/git-gc.txt | diff1 | diff2 | blobhistory |
| builtin/reflog.c | diff1 | diff2 | blobhistory |