![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 10 Nov 2009 20:36:26 +0000 (12:36 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 10 Nov 2009 20:36:26 +0000 (12:36 -0800) | ||
| commit | 8ac7a77be668180d515e234d550cc661aa0c1ebd | |
| tree | 8aa4710a131dbfd0722de487bcf91914882e39cd | tree | snapshot |
| parent | 6a93158c334fae92c5ca969cd0d0725c90af6b54 | commit | diff |
| parent | d629c40b0b8b63b0c8b33d52dcba0ed202d898d7 | commit | diff |
Merge branch 'maint'
* maint:
merge: do not setup worktree twice
check-ref-format: update usage string
Conflicts:
builtin-check-ref-format.c
* maint:
merge: do not setup worktree twice
check-ref-format: update usage string
Conflicts:
builtin-check-ref-format.c
| builtin-check-ref-format.c | diff1 | | diff2 | | blob | history |
| builtin-merge.c | diff1 | | diff2 | | blob | history |