From: Jiang Xin <worldhello.net@gmail.com>
Date: Tue, 28 Feb 2012 04:23:26 +0000 (+0800)
Subject: Merge branch 'master' into git-po
X-Git-Tag: v1.7.10-rc0~26^2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=508d1244dc8d38188c70e98207efa8a97d16b47c;p=git.git

Merge branch 'master' into git-po
---

508d1244dc8d38188c70e98207efa8a97d16b47c
diff --cc Makefile
index 882685712,cf2c40b44..be1957a5e
--- a/Makefile
+++ b/Makefile
@@@ -2576,8 -2635,13 +2635,12 @@@ dist-doc
  
  distclean: clean
  	$(RM) configure
 -	$(RM) po/git.pot
  
- clean:
+ profile-clean:
+ 	$(RM) $(addsuffix *.gcda,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
+ 	$(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
+ 
+ clean: profile-clean
  	$(RM) *.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \
  		builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
  	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X