]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fec274b 77c7278)
Merge branch 'yd/doc-merge-annotated-tag' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:19:37 +0000 (09:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:19:37 +0000 (09:19 -0700)
* yd/doc-merge-annotated-tag:
  Documentation: merging a tag is a special case

1  2 
Documentation/git-merge.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-merge.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.