diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-12-10 01:37:09 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-12-10 01:37:09 +0400 |
commit | eb8aa3d2c2849cb3a44396b89054339df38e2bfa (patch) | |
tree | 7af351487a380753f89376e78a9c860378d28bfb /Makefile | |
parent | a4043aeafed7962716a513e38ca1d5e192e7e831 (diff) | |
parent | 96b8d93a539f3a9f43f0fc38214db8753cac3c2e (diff) |
Merge branch 'jc/pull-signed-tag'
* jc/pull-signed-tag:
commit-tree: teach -m/-F options to read logs from elsewhere
commit-tree: update the command line parsing
commit: teach --amend to carry forward extra headers
merge: force edit and no-ff mode when merging a tag object
commit: copy merged signed tags to headers of merge commit
merge: record tag objects without peeling in MERGE_HEAD
merge: make usage of commit->util more extensible
fmt-merge-msg: Add contents of merged tag in the merge message
fmt-merge-msg: package options into a structure
fmt-merge-msg: avoid early returns
refs DWIMmery: use the same rule for both "git fetch" and others
fetch: allow "git fetch $there v1.0" to fetch a tag
merge: notice local merging of tags and keep it unwrapped
fetch: do not store peeled tag object names in FETCH_HEAD
Split GPG interface into its own helper library
Conflicts:
builtin/fmt-merge-msg.c
builtin/merge.c
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -536,6 +536,7 @@ LIB_H += fmt-merge-msg.h LIB_H += fsck.h LIB_H += gettext.h LIB_H += git-compat-util.h +LIB_H += gpg-interface.h LIB_H += graph.h LIB_H += grep.h LIB_H += hash.h @@ -629,6 +630,7 @@ LIB_OBJS += entry.o LIB_OBJS += environment.o LIB_OBJS += exec_cmd.o LIB_OBJS += fsck.o +LIB_OBJS += gpg-interface.o LIB_OBJS += graph.o LIB_OBJS += grep.o LIB_OBJS += hash.o |