| commit | ab24e7521c1027f7d86722345422ec92a5dde659 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Apr 2013 16:19:37 +0000 (1 09:19 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Apr 2013 16:19:37 +0000 (1 09:19 -0700) | ||
| tree | 437837a113b09eac048e2d0d680e4cfd5a75ad03 | treesnapshot (tar.gz zip) |
| parent | fec274b01f39262f945edb64c14c3bfe130b5bef | commitdiff |
| parent | 77c72780edfa5e3858423366fc91699724793b39 | commitdiff |
Merge branch 'yd/doc-merge-annotated-tag' into maint
* yd/doc-merge-annotated-tag:
Documentation: merging a tag is a special case
* yd/doc-merge-annotated-tag:
Documentation: merging a tag is a special case
| Documentation/git-merge.txt | diff1 | diff2 | blobhistory |