Added git commands batch files

javapoets · javapoets · commit 332c8a4dd658 · 2013-05-24T14:59:15.000-05:00
diff --git a/build.xml b/build.xml
@@ -35,7 +35,15 @@
 
   <target name="buildjar" depends="init">
 
-    <jar destfile="${jarfile}" basedir="${classes}">
+    <manifest file="MANIFEST.MF">
+<!--
+      <attribute name="Implementation-Version" value="${version.number}" />
+      <attribute name="Trusted-Library" value="true" />
+-->
+      <attribute name="Built-By" value="${user.name}"/>
+    </manifest>
+
+    <jar destfile="${jarfile}" basedir="${classes}" manifest="MANIFEST.MF">
 
       <include name="org/json/**/*.class" />
 <!--
diff --git a/git-fetch-upstream.bat b/git-fetch-upstream.bat
@@ -0,0 +1,3 @@
+:: http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/
+:: http://stackoverflow.com/questions/3903817/pull-new-updates-from-original-github-repository-into-forked-github-repository
+git fetch upstream
diff --git a/git-merge.bat b/git-merge.bat
@@ -0,0 +1,3 @@
+:: http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/
+:: http://stackoverflow.com/questions/3903817/pull-new-updates-from-original-github-repository-into-forked-github-repository
+git merge upstream/master master
diff --git a/git-pull-upstream-master.bat b/git-pull-upstream-master.bat
@@ -0,0 +1,2 @@
+:: http://stackoverflow.com/questions/3903817/pull-new-updates-from-original-github-repository-into-forked-github-repository
+git pull upstream master
diff --git a/git-remote-add.bat b/git-remote-add.bat
@@ -0,0 +1,4 @@
+:: http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/
+:: http://stackoverflow.com/questions/3903817/pull-new-updates-from-original-github-repository-into-forked-github-repository
+::git remote add --track master douglascrockford-JSON-java git://github.com/douglascrockford/JSON-java.git
+git remote add --track master upstream git://github.com/douglascrockford/JSON-java.git
diff --git a/org-json.jar b/org-json.jar

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+:: http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/`
	`2`	`+:: http://stackoverflow.com/questions/3903817/pull-new-updates-from-original-github-repository-into-forked-github-repository`
	`3`	`+git fetch upstream`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+:: http://stackoverflow.com/questions/3903817/pull-new-updates-from-original-github-repository-into-forked-github-repository`
	`2`	`+git pull upstream master`