diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:36:26 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:36:26 -0800 |
commit | 8ac7a77be668180d515e234d550cc661aa0c1ebd (patch) | |
tree | 8aa4710a131dbfd0722de487bcf91914882e39cd /gitweb | |
parent | 6a93158c334fae92c5ca969cd0d0725c90af6b54 (diff) | |
parent | d629c40b0b8b63b0c8b33d52dcba0ed202d898d7 (diff) | |
download | git-8ac7a77be668180d515e234d550cc661aa0c1ebd.tar.gz |
Merge branch 'maint'
* maint:
merge: do not setup worktree twice
check-ref-format: update usage string
Conflicts:
builtin-check-ref-format.c
Diffstat (limited to 'gitweb')
0 files changed, 0 insertions, 0 deletions