summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-27 01:13:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-27 01:39:04 (GMT)
commit80809062452a65146d73ae483415acbc737fabf1 (patch)
treed5b65e07896705f4dda05424a324fd455519d865 /Makefile
parentba998d33e22d6fce4445af5834dc227609672501 (diff)
parent62ed0728fe52312f270760187b3280bc51b6c2f0 (diff)
downloadgit-80809062452a65146d73ae483415acbc737fabf1.zip
git-80809062452a65146d73ae483415acbc737fabf1.tar.gz
git-80809062452a65146d73ae483415acbc737fabf1.tar.bz2
Merge branch 'maint'
* maint: Document accumulated fixes since 1.7.9.2 Git 1.7.8.5 grep -P: Fix matching ^ and $ am: don't infloop for an empty input file rebase -m: only call "notes copy" when rewritten exists and is non-empty git-p4: remove bash-ism in t9800 git-p4: remove bash-ism in t9809 git-p4: fix submit regression with clientSpec and subdir clone git-p4: set useClientSpec variable on initial clone Makefile: add thread-utils.h to LIB_H Conflicts: RelNotes t/t9809-git-p4-client-view.sh
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 1fb1705..cf2c40b 100644
--- a/Makefile
+++ b/Makefile
@@ -620,6 +620,7 @@ LIB_H += streaming.h
LIB_H += string-list.h
LIB_H += submodule.h
LIB_H += tag.h
+LIB_H += thread-utils.h
LIB_H += transport.h
LIB_H += tree.h
LIB_H += tree-walk.h