diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-11-08 16:35:53 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-11-08 16:35:53 -0800 |
commit | 916034b93ce45bdedfb1c5cef270e6eba2a26fea (patch) | |
tree | bb334bc156def237fa6e66f56009611aa095d450 /Documentation/merge-options.txt | |
parent | Merge branch 'jm/maint-gitweb-filter-forks-fix' into maint (diff) | |
parent | branch -m/-M: remove undocumented RENAMED-REF (diff) | |
download | tgif-916034b93ce45bdedfb1c5cef270e6eba2a26fea.tar.xz |
Merge branch 'jc/maint-remove-renamed-ref' into maint
* jc/maint-remove-renamed-ref:
branch -m/-M: remove undocumented RENAMED-REF
Conflicts:
refs.c
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions