Git - Revision history

Chris: /* Git With Android Studio */

2017-11-20T21:43:21Z

‎Git With Android Studio

2017-11-20T21:28:22Z

‎Git With Android Studio

2017-11-20T21:26:21Z

‎Git With Android Studio

2017-11-20T21:24:30Z

‎Git With Android Studio

2017-11-20T21:16:28Z

‎Git With Android Studio

2017-11-20T20:54:41Z

‎Git Ignore

2017-11-20T20:52:45Z

2017-11-19T20:30:43Z

2017-07-06T00:55:39Z

‎Undo a commit

2017-07-06T00:46:20Z

‎Merge branches

@@ Line 56: / Line 56: @@
 =Git With Android Studio=
 *Create the project + repo on Bitbucket. Create the project with Android Studio.
 *In AndroidStudio,

@@ Line 68: / Line 68: @@
 ***paste in the command copied from bitbucket
 ***git add .
-**Click the VCS push button (ctrl-K) to do initial commit. On the Commit button choose Commit and Push
+**Click the VCS push button (ctrl-K) to do initial commit. On the Commit button choose Commit and Push. Take obvious options, disregard code review.

@@ Line 68: / Line 68: @@
 ***paste in the command copied from bitbucket
 ***git add .
-**Click the VCS push button (ctrl-K) to do initial commit
+**Click the VCS push button (ctrl-K) to do initial commit. On the Commit button choose Commit and Push

@@ Line 65: / Line 65: @@
 *In Android Studio,
 **open Terminal panel
-**check you are in the project's root directory
+***check you are in the project's root directory
-**paste in the command copied from bitbucket
+***paste in the command copied from bitbucket

@@ Line 56: / Line 56: @@
 =Git With Android Studio=
-*Create the project on Bitbucket or wherever. Vreate the project with Android Studio.
+*Create the project + repo on Bitbucket. Create the project with Android Studio.
-*In AndroidStudio, choose VCS|Enable Version Control Integration, choose git
+*In AndroidStudio,
-*In AndroidStudio, in the Project tree (left panel), change view to Project, and locate .gitignore file. Update with gitignore from Got Ignore above
+**choose VCS|Enable Version Control Integration, choose git

@@ Line 52: / Line 52: @@
 =Git Ignore=
 Go to gitignore.io to generate a good list of files to ignore
 =Git With Android Studio=

← Older revision		Revision as of 20:52, 20 November 2017
Line 52:		Line 52:
	=Git Ignore=		=Git Ignore=
	Go to gitignore.io to generate a good list of files to ignore		Go to gitignore.io to generate a good list of files to ignore
		+
		+	=Git With Android Studio=
		+	*Create the project on Bitbucket or wherever. Vreate the project with Android Studio.
		+	*In AndroidStudio, choose VCS\|Enable Version Control Integration, choose git
		+	*In AndroidStudio, in the Project tree (left panel), change view to Project, and locate .gitignore file. Update with gitignore from Got Ignore above

← Older revision		Revision as of 20:30, 19 November 2017
Line 49:		Line 49:
	git reset --hard HEAD^ # use --hard if you don't care about keeping the changes you made		git reset --hard HEAD^ # use --hard if you don't care about keeping the changes you made
	</pre>		</pre>
		+
		+	=Git Ignore=
		+	Go to gitignore.io to generate a good list of files to ignore

@@ Line 41: / Line 41: @@
 git add .
 git commit -c ORIG_HEAD
 </pre>

@@ Line 31: / Line 31: @@
 git push origin master
 </pre>
 ==Undo a commit==