Do not mark tags fetched via --tags flag as mergeable

diff --git a/Makefile b/Makefile
index e9bf860f6db62e68784c4eac0a867b92b93e8bdf..dde8f331d69f87b4886fcace9bed82dd32a25912 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -397,6 +397,9 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
 git-cherry-pick: git-revert
        cp $< $@
 
+# format-patch records GIT_VERSION
+git-format-patch: Makefile
+
 %.o: %.c
        $(CC) -o $*.o -c $(ALL_CFLAGS) $<
 %.o: %.S