diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-13 23:03:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 23:07:47 -0800 |
| commit | b3f17ac3d6609c1ccede32ef783d4f2e92e7eba6 (patch) | |
| tree | bc35cae673d27af07911bfb410f46e890fec3f07 /builtin/merge-recursive.c | |
| parent | Merge branch 'jl/submodule-status-failure-report' (diff) | |
| parent | git-tag: introduce --cleanup option (diff) | |
| download | tgif-b3f17ac3d6609c1ccede32ef783d4f2e92e7eba6.tar.xz | |
Merge branch 'ks/tag-cleanup'
* ks/tag-cleanup:
git-tag: introduce --cleanup option
Conflicts:
builtin/tag.c
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions