From: Junio C Hamano <junkio@cox.net>
Date: Mon, 17 Apr 2006 05:07:28 +0000 (-0700)
Subject: Merge branch 'jc/boundary' into next
X-Git-Tag: v1.4.1-rc1~211
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9893e3eb92561fbfa397d30d571ac471fda146ee;p=git.git

Merge branch 'jc/boundary' into next

* jc/boundary:
  rev-list --boundary: show boundary commits even when limited otherwise.
  Makefile fixups.
  gitk: Fix bug caused by missing commitlisted elements
---

9893e3eb92561fbfa397d30d571ac471fda146ee
diff --cc Makefile
index 69ca05b2f,8371f7f52..84a4b8422
--- a/Makefile
+++ b/Makefile
@@@ -656,8 -653,7 +656,8 @@@ rpm: dis
  clean:
  	rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
  		$(LIB_FILE) $(XDIFF_LIB)
- 	rm -f $(ALL_PROGRAMS) git$X
+ 	rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
 +	rm -f test-date$X test-delta$X test-gsimm$X
  	rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
  	rm -rf $(GIT_TARNAME)
  	rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz