Junio C Hamano, Sat, Nov 17, 2007 20:15:20 +0100: > The plan is to stop merging gitk.git as a single file project > into git.git but instead use the subtree merge strategy into its > own subdirectory of git.git. We can use subproject support in > the future, but once _a_ subproject is used that means the > project's history is not pullable with subproject unaware > versions of git anymore, so I'd avoid it for now. You made it part of "all" target, which we will have to change if gitk is to become a subproject: Makefile better handle absence of the Makefile under gitk-git, and continue build. > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > --- > Makefile | 14 +++----------- > gitk-git/Makefile | 29 +++++++++++++++++++++++++++++ > gitk => gitk-git/gitk | 0 > 3 files changed, 32 insertions(+), 11 deletions(-) > create mode 100644 gitk-git/Makefile > rename gitk => gitk-git/gitk (100%) > mode change 100755 => 100644 ... > all:: > ifndef NO_TCLTK > $(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all > + $(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all maybe "git-gitk" instead of "gitk-git"? As "git-gui" and "gitweb"... Maybe even shorter: "gui", "web" and "k" :) - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html