mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 00:44:22 +01:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
308 Commits 6 Branches 956 Tags 311 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
cdf6e08880
Go to file
Shawn O. Pearce cdf6e08880 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>
2007-02-13 23:43:48 -05:00
.gitignore git-gui: Ensure version number is always current. 2007-01-21 02:54:19 -05:00
git-gui.sh git-gui: Permit merging tags into the current branch. 2007-02-13 23:43:48 -05:00
GIT-VERSION-GEN git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull" 2007-02-13 10:35:58 -05:00
Makefile git-gui: Generate a version file on demand. 2007-02-12 16:14:44 -05:00
TODO git-gui: Update todo list with finished and new items. 2007-01-21 22:47:59 -05:00