summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-09 21:37:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-09 21:37:05 (GMT)
commita4043aeafed7962716a513e38ca1d5e192e7e831 (patch)
treee48b94c2e8073ad86e2e8e0801766e217e0397b1 /Makefile
parent1ee740e66975adbab080301ebd364e253be3d513 (diff)
parentd050464541d51ab65863218d93b351de3392f476 (diff)
downloadgit-a4043aeafed7962716a513e38ca1d5e192e7e831.zip
git-a4043aeafed7962716a513e38ca1d5e192e7e831.tar.gz
git-a4043aeafed7962716a513e38ca1d5e192e7e831.tar.bz2
Merge branch 'jc/request-pull-show-head-4'
* jc/request-pull-show-head-4: request-pull: use the annotated tag contents fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error environment.c: Fix an sparse "symbol not declared" warning builtin/log.c: Fix an "Using plain integer as NULL pointer" warning fmt-merge-msg: use branch.$name.description request-pull: use the branch description request-pull: state what commit to expect request-pull: modernize style branch: teach --edit-description option format-patch: use branch description in cover letter branch: add read_branch_desc() helper function Conflicts: builtin/branch.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b21d2f1..d78bd76 100644
--- a/Makefile
+++ b/Makefile
@@ -532,6 +532,7 @@ LIB_H += diffcore.h
LIB_H += diff.h
LIB_H += dir.h
LIB_H += exec_cmd.h
+LIB_H += fmt-merge-msg.h
LIB_H += fsck.h
LIB_H += gettext.h
LIB_H += git-compat-util.h