Re: [PATCH] Documentation: merging a tag is a special case
- From
Yann Droneaud <ydroneaud@opteya.com>
- Date
- Mar 21, 2013, 21:47 UTC
- Message-ID
- <1363902468-14764-1-git-send-email-ydroneaud@opteya.com>
- In-Reply-To
- <7vehf8a4ze.fsf@alter.siamese.dyndns.org>
Hi,
Just a little change I made on my own. The other part are definitely better than my version, so I propose to merge all the patches in the thread with you as author, putting Jonathan Nieder and myself as reviewers.
Regards
Documentation/git-merge.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index dd90feb..42391f2 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -176,8 +176,8 @@ MERGING TAG When merging an annotated (and possibly signed) tag, Git always creates a merge commit even if a fast-forward merge is possible, and the commit message template is prepared with the tag message. -Additionally, the signature check is reported as a comment -if the tag is signed. See also linkgit:git-tag[1]. +Additionally, if the tag is signed, the signature check is reported +as a comment in the message template. See also linkgit:git-tag[1]. When you want to just integrate with the work leading to the commit that happens to be tagged, e.g. synchronizing with an upstream
-- 1.7.11.7