From 6db212ef101ef675a2537dba778149d144fe24e8 Mon Sep 17 00:00:00 2001
From: Takuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Date: Sun, 15 Feb 2015 21:30:20 +0900
Subject: [PATCH] 	modified:   .gitignore 	modified:   Makefile 
 modified:   bin/wish/Display2/tclIndex

---
 .gitignore                 |  4 ++++
 Makefile                   | 11 +++++++----
 bin/wish/Display2/tclIndex |  8 --------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index eaa9967f2c..cd550d47f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,10 @@ hostdepend/X86LINUX64ICC/
 *.orig
 *.orig*
 bin/wish/*/tclIndex
+*/*/*/*/tclIndex
+*/*/*/tclIndex
+*/*/tclIndex
+*/tclIndex
 
 #
 data/
diff --git a/Makefile b/Makefile
index 7a0be0d52c..cc1beb1e55 100644
--- a/Makefile
+++ b/Makefile
@@ -106,8 +106,9 @@ git-add::
 git-add-hostdepend::
 	#echo tacyas@git.sourceforge.jp:/gitroot/eos/hostdependX86MAC64.git
 	#echo $${EOS_GITUSER}@$(EOS_GIT_REPOSITRY_HOSTDEPEND)$${EOS_HOSTDIR}.git
-	git remote add -f hostdepend$${EOS_HOSTDIR} $${EOS_GITUSER}@$(EOS_GIT_REPOSITRY_HOSTDEPEND)$${EOS_HOSTDIR}.git 
-	git subtree add --prefix=hostdepend/$${EOS_HOSTDIR}/ --squash hostdepend$${EOS_HOSTDIR} master 
+	cd hostdepend/$${EOS_HOSTDIR}/ ; git remote add hostdepend$${EOS_HOSTDIR} $${EOS_GITUSER}@$(EOS_GIT_REPOSITRY_HOSTDEPEND)$${EOS_HOSTDIR}.git | echo "Already exist"
+	#git subtree add --prefix=hostdepend/$${EOS_HOSTDIR}/ --squash hostdepend$${EOS_HOSTDIR} master 
+	cd hostdepend/$${EOS_HOSTDIR}/ ; git add -v --all . ; git commit
 
 git-add-optional::
 	cd optional; git add -v --all . 
@@ -190,7 +191,8 @@ git-push::git-push-hostdepend
 	make git-push-with-check;
 
 git-push-hostdepend::
-	git subtree push --prefix=hostdepend/$${EOS_HOSTDIR}/ --squash hostdepend$${EOS_HOSTDIR} master 
+	#git subtree push --prefix=hostdepend/$${EOS_HOSTDIR}/ --squash hostdepend$${EOS_HOSTDIR} master 
+	cd hostdepend/$${EOS_HOSTDIR}/;  git push hostdepend$${EOS_HOSTDIR} master 
 
 git-push-optional::
 #	cd optional; git push optional master --tags
@@ -242,7 +244,8 @@ git-fetch::git-pull-hostdepend
 	cd .       ; git fetch origin master --tags 	; git log -1
 
 git-pull-hostdepend::
-	git subtree pull --prefix=hostdepend/$${EOS_HOSTDIR}/ --squash hostdepend$${EOS_HOSTDIR} master 
+	#git subtree pull --prefix=hostdepend/$${EOS_HOSTDIR}/ --squash hostdepend$${EOS_HOSTDIR} master 
+	cd hostdepend/$${EOS_HOSTDIR}/; git pull hostdepend$${EOS_HOSTDIR} master 
 
 git-fetch-data::
 	cd data    ; git fetch data master --tags		; git log -1
diff --git a/bin/wish/Display2/tclIndex b/bin/wish/Display2/tclIndex
index acd879f1d9..e727737625 100644
--- a/bin/wish/Display2/tclIndex
+++ b/bin/wish/Display2/tclIndex
@@ -46,7 +46,6 @@ set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuR
 set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]]
-<<<<<<< HEAD
 set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
 set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
 set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
@@ -61,9 +60,6 @@ set auto_index(rectangleResize) [list source [file join $dir RoiAreaResize.wish]
 set auto_index(rectangleResizeCalc) [list source [file join $dir RoiAreaResize.wish]]
 set auto_index(lineResize) [list source [file join $dir RoiAreaResize.wish]]
 set auto_index(splineResize) [list source [file join $dir RoiAreaResize.wish]]
-=======
-set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
->>>>>>> FETCH_HEAD
 set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]]
@@ -130,13 +126,9 @@ set auto_index(sectionCreate) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionClearAll) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionClear) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionChange) [list source [file join $dir SectionUtil.wish]]
-<<<<<<< HEAD
 set auto_index(display2DesktopSet) [list source [file join $dir Display2Desktop.wish]]
 set auto_index(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]]
 set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]]
 set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]]
 set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]]
 set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]]
-=======
-set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
->>>>>>> FETCH_HEAD
-- 
2.11.0