diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:18 -0700 |
| commit | a660534e06147f8867d6c9b6c41025427a7b5c6c (patch) | |
| tree | 0ba8f85b478e0642ee775df82a94c3640217d756 /t/t7605-merge-resolve.sh | |
| parent | Merge branch 'cw/maint-exec-defpath' (diff) | |
| parent | reflog --expire-unreachable: special case entries in "HEAD" reflog (diff) | |
| download | tgif-a660534e06147f8867d6c9b6c41025427a7b5c6c.tar.xz | |
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
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions