aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2008-08-08 01:50:31 +0200
committerJunio C Hamano <gitster@pobox.com>2008-08-08 16:19:51 -0700
commit261044e85ddac3de48dc74dd9c416c95147022ad (patch)
treef1d605edbe9b7cc93b391c925d9c4b3c697cf0bc /ll-merge.c
parent8afa42101d14f8944c1eb7f2e54d4f5300d2bb73 (diff)
downloadgit-261044e85ddac3de48dc74dd9c416c95147022ad.tar.gz
git-261044e85ddac3de48dc74dd9c416c95147022ad.tar.xz
filter-branch: be more helpful when an annotated tag changes
Previously, git-filter-branch failed if it attempted to update an annotated tag. Now we ignore this condition if --tag-name-filter is given, so that we can later rewrite the tag. If no such option was provided, we warn the user that he might want to run with "--tag-name-filter cat" to achieve the intended effect. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions