Git Tips - Revision history

74.124.100.45 at 21:43, 28 February 2013

2013-02-28T21:43:35Z

2013-02-22T22:06:48Z

Getting down to business with setting up and using a particular repository (Basic Usage)

2013-02-22T20:56:09Z

Settings More Global / General in Nature

2013-02-22T20:55:23Z

2013-02-22T20:47:52Z

2012-08-20T22:12:59Z

2012-08-20T22:12:03Z

2012-08-20T22:11:09Z

2012-08-20T22:08:54Z

2012-08-20T22:08:08Z

@@ Line 104: / Line 104: @@
 Should be golden.  Here's one place for more info:
 http://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git
 ==Incorporating Github as a remote repository==

@@ Line 70: / Line 70: @@
 Push local repo to your remote one (in this case, remote is a dropbox share):
   $ git push ~/Dropbox/bob_n_bob/git/busey_erode_inputs.git master
 ==Incorporating Github as a remote repository==

@@ Line 24: / Line 24: @@
 Then, using a text editor, write these to a .ignore file in the root repo directory.  Alternately, you can do the same on a global basis (i.e. for all of the git projects on your computer):
   $ gedit ~/.global_ignore &
-  [Paste in content from the links above
+  [Paste in content from the links above & save]
   $ git config --global core.excludesfile ~/.global_ignore
 If you screw up and add the wrong files to your project by accident in the initial setup, you can remove them like this:

@@ Line 15: / Line 15: @@
 To prevent tracking of extraneous dot files, pycs etc etc, it's a good idea to add a .gitignore to your root git directory... or supply one to your global settings.  To set up a per-repo one, find the text appropriate to your repository here:<br>
 https://github.com/github/gitignore<br>
 Then, using a text editor, write these to a .ignore file in the root repo directory.  Alternately, you can do the same on a global basis (i.e. for all of the git projects on your computer):
   $ git config --global core.excludesfile ~/.global_ignore
 If you screw up and add the wrong files to your project by accident in the initial setup, you can remove them like this:

@@ Line 176: / Line 176: @@
 To upload new project to GITHUB from Aptana Studio 3:
-<br\>The following directions modify/are from:
+<br\>The following directions are modified from:
 <br\>https://aptanastudio.tenderapp.com/discussions/questions/1219-aptana-and-github

@@ Line 196: / Line 196: @@
 :error: failed to push some refs to 'git@github ... .git'
-and it was solved by executing the following commands:
+It was solved by executing the following commands:
 :$ touch README
 :$ git add README

@@ Line 127: / Line 127: @@
 	Solution to clone issue:
 		$git clone git@github.com:bryanj007/NewTutorial.git
-creates NewTutorial folder in the current directory with files in it from GitHub
+        creates NewTutorial folder in the current directory with files in it from GitHub
   	If accidentally use git protocol, will need to change URL of origin:

@@ Line 98: / Line 98: @@
 	$git push git@github.com:frankohanlon/DataPro-for-Windows master
 	$git push git@github.com:frankohanlon/DataPro master
 	$diff DataPro/datapro.py DataPro/datapro.py
 	$git remote add origin git@github.com:frankohanlon/DataPro_Sample_Files.git