Skip to main content

Browse the archive

Staging
v0.5.1
swh:1:snp:c5feb7ee9221a3820c8879e85e8a18470c0b3afa
Revision cdf6e08880b4924fa717bd6ca700081f445c9065 authored by Shawn O. Pearce on 14 February 2007, 04:43:48 UTC, committed by Shawn O. Pearce on 14 February 2007, 04:43:48 UTC 
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>
1 parent 54acdd9
History
Tip revision: 297ca895a27a6bbdb7906371d533f72a12ad25b2 authored by Junio C Hamano on 20 January 2022, 23:25:38 UTC
Merge branch 'js/branch-track-inherit'
Tip revision: 297ca89
File Mode Size
.gitignore -rw-r--r-- 36 bytes
GIT-VERSION-GEN -rwxr-xr-x 1.6 KB
Makefile -rw-r--r-- 1.3 KB
TODO -rw-r--r-- 1.6 KB
git-gui.sh -rwxr-xr-x 143.8 KB
back to top