author | Shawn O. Pearce <spearce@spearce.org> | |
Wed, 14 Feb 2007 04:43:48 +0000 (23:43 -0500) | ||
committer | Shawn O. Pearce <spearce@spearce.org> | |
Wed, 14 Feb 2007 04:43:48 +0000 (23:43 -0500) | ||
commit | cdf6e08880b4924fa717bd6ca700081f445c9065 | |
tree | 8005a914617b154409d037ab454bf85613abe527 | tree | snapshot |
parent | 54acdd95b81d3675381a749e7cd7fc14956853c3 | commit | diff |
git-gui: Permit merging tags into the current branch.
It was pointed out on the git mailing list by Martin Koegler that
we did not show tags as possible things to merge into the current
branch. They actually are, and core Git's Grand Unified Merge
Driver will accept them just like any other commit.
So our merge dialog now requests all refs/heads, refs/remotes and
refs/tags named refs and attempts to match them against the commits
not in HEAD. One complicating factor here is that we must use the
%(*objectname) field when talking about an annotated tag, as they
will not appear in the output of rev-list.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
It was pointed out on the git mailing list by Martin Koegler that
we did not show tags as possible things to merge into the current
branch. They actually are, and core Git's Grand Unified Merge
Driver will accept them just like any other commit.
So our merge dialog now requests all refs/heads, refs/remotes and
refs/tags named refs and attempts to match them against the commits
not in HEAD. One complicating factor here is that we must use the
%(*objectname) field when talking about an annotated tag, as they
will not appear in the output of rev-list.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui.sh | diff | blob | history |