<?xml version="1.0"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
	<id>http://ocotal.iarc.uaf.edu/api.php?action=feedcontributions&amp;feedformat=atom&amp;user=63.140.104.167&amp;*</id>
	<title>IARC 207 Wiki - User contributions [en]</title>
	<link rel="self" type="application/atom+xml" href="http://ocotal.iarc.uaf.edu/api.php?action=feedcontributions&amp;feedformat=atom&amp;user=63.140.104.167&amp;*"/>
	<link rel="alternate" type="text/html" href="http://ocotal.iarc.uaf.edu/index.php?title=Special:Contributions/63.140.104.167"/>
	<updated>2026-05-12T23:44:20Z</updated>
	<subtitle>User contributions</subtitle>
	<generator>MediaWiki 1.34.2</generator>
	<entry>
		<id>http://ocotal.iarc.uaf.edu/index.php?title=Git_Tips&amp;diff=1819</id>
		<title>Git Tips</title>
		<link rel="alternate" type="text/html" href="http://ocotal.iarc.uaf.edu/index.php?title=Git_Tips&amp;diff=1819"/>
		<updated>2013-02-22T22:06:48Z</updated>

		<summary type="html">&lt;p&gt;63.140.104.167: /* Getting down to business with setting up and using a particular repository (Basic Usage) */&lt;/p&gt;
&lt;hr /&gt;
&lt;div&gt;==Some Online Resources:==&lt;br /&gt;
As specific questions come up you'll find more stuff via searching, I'm sure.&amp;lt;br&amp;gt;&lt;br /&gt;
http://try.github.com/levels/1/challenges/1&amp;lt;br&amp;gt;&lt;br /&gt;
http://git-scm.com/book/en/Git-Basics-Viewing-the-Commit-History&amp;lt;br&amp;gt;&lt;br /&gt;
http://rogerdudler.github.com/git-guide/&amp;lt;br&amp;gt;&lt;br /&gt;
http://ndpsoftware.com/git-cheatsheet.html&amp;lt;br&amp;gt;&lt;br /&gt;
http://git-scm.com/downloads&amp;lt;br&amp;gt;&lt;br /&gt;
http://www.sbf5.com/~cduan/technical/git/git-1.shtml&lt;br /&gt;
https://tiredblogger.wordpress.com/2009/11/09/creating-local-git-repositories-yeah-its-that-simple/&lt;br /&gt;
&lt;br /&gt;
==Settings More Global / General in Nature ==&lt;br /&gt;
Set up your name/ email address type stuff:&lt;br /&gt;
 $ git config --global user.email &amp;quot;me@here.com&amp;quot;&lt;br /&gt;
 $ git config --global user.name &amp;quot;Bob&amp;quot;&lt;br /&gt;
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:&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
e.g.&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Perl.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Python.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/R.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Global/Linux.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Global/OSX.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Global/Windows.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
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):&lt;br /&gt;
 $ gedit ~/.global_ignore &amp;amp; &lt;br /&gt;
 [Paste in content from the links above &amp;amp; save]&lt;br /&gt;
 $ git config --global core.excludesfile ~/.global_ignore&lt;br /&gt;
If you screw up and add the wrong files to your project by accident in the initial setup, you can remove them like this:&lt;br /&gt;
 $ git rm *.pyc&lt;br /&gt;
 $ git rm --cached *.pyc&lt;br /&gt;
 $ git commit -am 'Accidentally added an excluded file type.. did not have .ignore configured yet'   &lt;br /&gt;
Then, check to see they're now excluded by listing all the files in version control:&lt;br /&gt;
 $ git ls-tree -r master --name-only&lt;br /&gt;
&lt;br /&gt;
Quick overview of commits that have been made:&lt;br /&gt;
 $ git log --pretty=format:&amp;quot;%h - %an, %ar : %s&amp;quot;&lt;br /&gt;
 8d8befa - Frank, 11 hours ago : relative paths set up for the initial configs&lt;br /&gt;
 1e0b20d - Frank, 17 hours ago : Initial commit of the super simple test run supplied by Scott.&lt;br /&gt;
&lt;br /&gt;
Oh, also, if you don't want to use ''nano'' as your default text editor here are another couple of options:&lt;br /&gt;
 $ git config --global core.editor &amp;quot;gedit&amp;quot;&lt;br /&gt;
 $ git config --global core.editor &amp;quot;vim&amp;quot;&lt;br /&gt;
 $ git config --global core.editor &amp;quot;mate -w&amp;quot;&lt;br /&gt;
&lt;br /&gt;
==Getting down to business with setting up and using a particular repository (Basic Usage)==&lt;br /&gt;
Now, let's set up a local repository and a remote one to push to / share with others.&amp;lt;br&amp;gt;&lt;br /&gt;
First, set up your local repo:&lt;br /&gt;
 $ cd /path/to/directory_to_enable_git_in/&lt;br /&gt;
 $ git init&lt;br /&gt;
 $ git add *&lt;br /&gt;
 $ git commit -am &amp;quot;first commit&amp;quot;&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
Next, set up a remote repository when you already have an existing one... in this case, the remote is in another folder, like a dropbox share:&lt;br /&gt;
e.g.&amp;lt;br&amp;gt;  http://stackoverflow.com/questions/1960799/using-gitdropbox-together-effectively&lt;br /&gt;
 $ cd ~/Dropbox/bob_n_bob/git/&lt;br /&gt;
 $ git init --bare erode_utilities.git&lt;br /&gt;
 $ cd ~/path/to/local_repo/&lt;br /&gt;
 $ git remote add origin ~/Dropbox/bob_n_bob/git/erode_utilities.git&lt;br /&gt;
 $ git remote set-url origin ~/Dropbox/bob_n_bob/git/erode_utilities.git&lt;br /&gt;
 $ git push -u origin master&lt;br /&gt;
&lt;br /&gt;
Say you typo the previous set up or your remote has a new location, you can change no problem from git:&amp;lt;br&amp;gt;&lt;br /&gt;
http://stackoverflow.com/questions/2432764/how-to-change-a-remote-repository-uri-using-git&lt;br /&gt;
 $ git remote add origin ~/dropbox/bob_n_bob/git/erode_clubfooted_typos_in_here.git   # oops!&lt;br /&gt;
 $ git remote set-url origin ~/dropbox/bob_n_bob/git/erode_correct_utilities.git      # this command corrects for the previous error&lt;br /&gt;
 $ git push -u origin master                                                          # now you can push your local repo to the remote.&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
Push local repo to your remote one (in this case, remote is a dropbox share):&lt;br /&gt;
 $ git push ~/Dropbox/bob_n_bob/git/busey_erode_inputs.git master&lt;br /&gt;
&lt;br /&gt;
Now, say you are just starting out sharing a codebase with someone.  In the past you've each had independent repositories.  Now however, you'd like to combine them and your partner has already initialized the shared remote repo...  &lt;br /&gt;
 $ git push ~/Dropbox/bob_n_bob/git/framework.git master&lt;br /&gt;
'''Ooops!'''&lt;br /&gt;
 To /Users/bob/Dropbox/bob_n_bob/git/Framework.git&lt;br /&gt;
     ! [rejected]        master -&amp;gt; master (non-fast-forward)&lt;br /&gt;
  error: failed to push some refs to '/Users/bob/Dropbox/bob_n_bob/git/Framework.git'&lt;br /&gt;
  hint: Updates were rejected because the tip of your current branch is behind&lt;br /&gt;
  hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')&lt;br /&gt;
  hint: before pushing again.&lt;br /&gt;
  hint: See the 'Note about fast-forwards' in 'git push --help' for details.&lt;br /&gt;
So:&lt;br /&gt;
 $ git fetch origin&lt;br /&gt;
 From /Users/bob/Dropbox/bob_n_bob/git/Framework&lt;br /&gt;
 * [new branch]      master     -&amp;gt; origin/master&lt;br /&gt;
No problem there.  Now let's try pulling the rest:&lt;br /&gt;
 $ git pull origin master&lt;br /&gt;
    U    Erode3_Jan_2013/erode_base.py&lt;br /&gt;
    U    framework.py&lt;br /&gt;
 Pull is not possible because you have unmerged files.&lt;br /&gt;
 Please, fix them up in the work tree, and then use 'git add/rm &amp;lt;file&amp;gt;'&lt;br /&gt;
 as appropriate to mark resolution, or use 'git commit -a'.&lt;br /&gt;
So, time to fire up the mergetool to sort this out:&lt;br /&gt;
 $ git mergetool&lt;br /&gt;
   Merging:&lt;br /&gt;
     Erode3_Jan_2013/erode_base.py&lt;br /&gt;
     framework.py&lt;br /&gt;
This may / should bring up a windowed diff manager to allow you to select which changes to accept... if it doesn't, install one:&lt;br /&gt;
 # aptitude install meld&lt;br /&gt;
Next... commit the merged conflict fixes:&lt;br /&gt;
 $ git commit -m &amp;quot;rectified merge conflicts&amp;quot;&lt;br /&gt;
 $ git push origin master&lt;br /&gt;
Should be golden.  Here's one place for more info:&lt;br /&gt;
http://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git&lt;br /&gt;
&lt;br /&gt;
==Incorporating Github as a remote repository==&lt;br /&gt;
&lt;br /&gt;
To deal with creating keys and using them with GitHub:&amp;lt;br&amp;gt;&lt;br /&gt;
https://help.github.com/articles/generating-ssh-keys&amp;lt;br&amp;gt;&lt;br /&gt;
&lt;br /&gt;
If you're using Github... and you mess up, post some private data (people pushing private keys to github was in the news in 2012 I think)&amp;lt;br&amp;gt;&lt;br /&gt;
https://help.github.com/articles/remove-sensitive-data&amp;lt;br&amp;gt;&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
-------------------------------------------------------------------------------------&lt;br /&gt;
==Windows Specific Notes==&lt;br /&gt;
To use Git from Aptana Studio 3:&amp;lt;br&amp;gt;&lt;br /&gt;
* (from Mozilla Firefox, not IE) install Aptana Studio 3:&lt;br /&gt;
** http://www.aptana.com/products/studio3/download&lt;br /&gt;
* Note that after installing Aptana Studio 3, it will have to be configured to use Pydev:		&lt;br /&gt;
** Under the windows menu in Aptana Studio, select ''preferences'' then select the ''python interpreter''.&lt;br /&gt;
** Under the windows menu in Aptana Studio, select ''Open Perspective'', then ''other'', then ''yDev''&lt;br /&gt;
** Keys will have to be created in the Git Bash window.&lt;br /&gt;
** Also from the GitBash window,  git init will need to be run from the desired workspace directory&lt;br /&gt;
** Some git configuring will be required from the Git Bash window (as shown above in the general git section):&lt;br /&gt;
*** git config --global user.email &amp;quot;me@here.com&amp;quot;&lt;br /&gt;
*** git config --global user.name &amp;quot;Your Name Comes Here&amp;quot;&lt;br /&gt;
* To work on and download existing project from GitHub:&lt;br /&gt;
** right-click on the PyDev Package Explorer, select the “Import” option, and in the “URI” box that pops up, paste the DataPro from GitHub link:&lt;br /&gt;
*** ''git@github.com:frankohanlon/DataPro.git'' (the other box should automatically fill up with corresponding text)&lt;br /&gt;
* To use/locate git commands from Aptana Studio 3:&lt;br /&gt;
** Right-click on the project, select Team and then the appropriate Git command.&lt;br /&gt;
* To upload new project to GITHUB from Aptana Studio 3:&amp;lt;br&amp;gt;&lt;br /&gt;
** (The following directions are modified from: https://aptanastudio.tenderapp.com/discussions/questions/1219-aptana-and-github )&lt;br /&gt;
# Create a new project&lt;br /&gt;
# Right-click on project...&amp;quot;Team &amp;gt; Share Project&amp;quot;. Commit your local contents to that repo&lt;br /&gt;
# Create a new Github repo&lt;br /&gt;
# From Aptana studio,  right-click &amp;quot;Add remote&amp;quot; and paste in the URL of your project&amp;lt;br\&amp;gt;(Team-&amp;gt; Remotes--&amp;gt;Add Remote) &lt;br /&gt;
# $ git status&lt;br /&gt;
# $ git add src/&lt;br /&gt;
# You have to follow up with  one manual step ATM. Type &amp;quot;git push -u origin master&amp;quot; in the console for the project&lt;br /&gt;
# You can now push your files up to Github.&lt;br /&gt;
&lt;br /&gt;
Notes from Bryan:	&lt;br /&gt;
 I once had a weird error..The error message was something like this:&lt;br /&gt;
 :error: src refspec master does not match any.&lt;br /&gt;
 :error: failed to push some refs to 'git@github ... .git'&lt;br /&gt;
 It was solved by executing the following commands:&lt;br /&gt;
 :$ touch README&lt;br /&gt;
 :$ git add README&lt;br /&gt;
 :$ git add (all other files)&lt;br /&gt;
 :$ git commit -m 'reinitialized files'&lt;br /&gt;
 :$ git push origin master --force&lt;/div&gt;</summary>
		<author><name>63.140.104.167</name></author>
		
	</entry>
	<entry>
		<id>http://ocotal.iarc.uaf.edu/index.php?title=Git_Tips&amp;diff=1818</id>
		<title>Git Tips</title>
		<link rel="alternate" type="text/html" href="http://ocotal.iarc.uaf.edu/index.php?title=Git_Tips&amp;diff=1818"/>
		<updated>2013-02-22T20:56:09Z</updated>

		<summary type="html">&lt;p&gt;63.140.104.167: /* Settings More Global / General in Nature */&lt;/p&gt;
&lt;hr /&gt;
&lt;div&gt;==Some Online Resources:==&lt;br /&gt;
As specific questions come up you'll find more stuff via searching, I'm sure.&amp;lt;br&amp;gt;&lt;br /&gt;
http://try.github.com/levels/1/challenges/1&amp;lt;br&amp;gt;&lt;br /&gt;
http://git-scm.com/book/en/Git-Basics-Viewing-the-Commit-History&amp;lt;br&amp;gt;&lt;br /&gt;
http://rogerdudler.github.com/git-guide/&amp;lt;br&amp;gt;&lt;br /&gt;
http://ndpsoftware.com/git-cheatsheet.html&amp;lt;br&amp;gt;&lt;br /&gt;
http://git-scm.com/downloads&amp;lt;br&amp;gt;&lt;br /&gt;
http://www.sbf5.com/~cduan/technical/git/git-1.shtml&lt;br /&gt;
https://tiredblogger.wordpress.com/2009/11/09/creating-local-git-repositories-yeah-its-that-simple/&lt;br /&gt;
&lt;br /&gt;
==Settings More Global / General in Nature ==&lt;br /&gt;
Set up your name/ email address type stuff:&lt;br /&gt;
 $ git config --global user.email &amp;quot;me@here.com&amp;quot;&lt;br /&gt;
 $ git config --global user.name &amp;quot;Bob&amp;quot;&lt;br /&gt;
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:&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
e.g.&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Perl.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Python.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/R.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Global/Linux.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Global/OSX.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Global/Windows.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
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):&lt;br /&gt;
 $ gedit ~/.global_ignore &amp;amp; &lt;br /&gt;
 [Paste in content from the links above &amp;amp; save]&lt;br /&gt;
 $ git config --global core.excludesfile ~/.global_ignore&lt;br /&gt;
If you screw up and add the wrong files to your project by accident in the initial setup, you can remove them like this:&lt;br /&gt;
 $ git rm *.pyc&lt;br /&gt;
 $ git rm --cached *.pyc&lt;br /&gt;
 $ git commit -am 'Accidentally added an excluded file type.. did not have .ignore configured yet'   &lt;br /&gt;
Then, check to see they're now excluded by listing all the files in version control:&lt;br /&gt;
 $ git ls-tree -r master --name-only&lt;br /&gt;
&lt;br /&gt;
Quick overview of commits that have been made:&lt;br /&gt;
 $ git log --pretty=format:&amp;quot;%h - %an, %ar : %s&amp;quot;&lt;br /&gt;
 8d8befa - Frank, 11 hours ago : relative paths set up for the initial configs&lt;br /&gt;
 1e0b20d - Frank, 17 hours ago : Initial commit of the super simple test run supplied by Scott.&lt;br /&gt;
&lt;br /&gt;
Oh, also, if you don't want to use ''nano'' as your default text editor here are another couple of options:&lt;br /&gt;
 $ git config --global core.editor &amp;quot;gedit&amp;quot;&lt;br /&gt;
 $ git config --global core.editor &amp;quot;vim&amp;quot;&lt;br /&gt;
 $ git config --global core.editor &amp;quot;mate -w&amp;quot;&lt;br /&gt;
&lt;br /&gt;
==Getting down to business with setting up and using a particular repository (Basic Usage)==&lt;br /&gt;
Now, let's set up a local repository and a remote one to push to / share with others.&amp;lt;br&amp;gt;&lt;br /&gt;
First, set up your local repo:&lt;br /&gt;
 $ cd /path/to/directory_to_enable_git_in/&lt;br /&gt;
 $ git init&lt;br /&gt;
 $ git add *&lt;br /&gt;
 $ git commit -am &amp;quot;first commit&amp;quot;&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
Next, set up a remote repository when you already have an existing one... in this case, the remote is in another folder, like a dropbox share:&lt;br /&gt;
e.g.&amp;lt;br&amp;gt;  http://stackoverflow.com/questions/1960799/using-gitdropbox-together-effectively&lt;br /&gt;
 $ cd ~/Dropbox/bob_n_bob/git/&lt;br /&gt;
 $ git init --bare erode_utilities.git&lt;br /&gt;
 $ cd ~/path/to/local_repo/&lt;br /&gt;
 $ git remote add origin ~/Dropbox/bob_n_bob/git/erode_utilities.git&lt;br /&gt;
 $ git remote set-url origin ~/Dropbox/bob_n_bob/git/erode_utilities.git&lt;br /&gt;
 $ git push -u origin master&lt;br /&gt;
&lt;br /&gt;
Say you typo the previous set up or your remote has a new location, you can change no problem from git:&amp;lt;br&amp;gt;&lt;br /&gt;
http://stackoverflow.com/questions/2432764/how-to-change-a-remote-repository-uri-using-git&lt;br /&gt;
 $ git remote add origin ~/dropbox/bob_n_bob/git/erode_clubfooted_typos_in_here.git   # oops!&lt;br /&gt;
 $ git remote set-url origin ~/dropbox/bob_n_bob/git/erode_correct_utilities.git      # this command corrects for the previous error&lt;br /&gt;
 $ git push -u origin master                                                          # now you can push your local repo to the remote.&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
Push local repo to your remote one (in this case, remote is a dropbox share):&lt;br /&gt;
 $ git push ~/Dropbox/bob_n_bob/git/busey_erode_inputs.git master&lt;br /&gt;
&lt;br /&gt;
==Incorporating Github as a remote repository==&lt;br /&gt;
&lt;br /&gt;
To deal with creating keys and using them with GitHub:&amp;lt;br&amp;gt;&lt;br /&gt;
https://help.github.com/articles/generating-ssh-keys&amp;lt;br&amp;gt;&lt;br /&gt;
&lt;br /&gt;
If you're using Github... and you mess up, post some private data (people pushing private keys to github was in the news in 2012 I think)&amp;lt;br&amp;gt;&lt;br /&gt;
https://help.github.com/articles/remove-sensitive-data&amp;lt;br&amp;gt;&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
-------------------------------------------------------------------------------------&lt;br /&gt;
==Windows Specific Notes==&lt;br /&gt;
To use Git from Aptana Studio 3:&amp;lt;br&amp;gt;&lt;br /&gt;
* (from Mozilla Firefox, not IE) install Aptana Studio 3:&lt;br /&gt;
** http://www.aptana.com/products/studio3/download&lt;br /&gt;
* Note that after installing Aptana Studio 3, it will have to be configured to use Pydev:		&lt;br /&gt;
** Under the windows menu in Aptana Studio, select ''preferences'' then select the ''python interpreter''.&lt;br /&gt;
** Under the windows menu in Aptana Studio, select ''Open Perspective'', then ''other'', then ''yDev''&lt;br /&gt;
** Keys will have to be created in the Git Bash window.&lt;br /&gt;
** Also from the GitBash window,  git init will need to be run from the desired workspace directory&lt;br /&gt;
** Some git configuring will be required from the Git Bash window (as shown above in the general git section):&lt;br /&gt;
*** git config --global user.email &amp;quot;me@here.com&amp;quot;&lt;br /&gt;
*** git config --global user.name &amp;quot;Your Name Comes Here&amp;quot;&lt;br /&gt;
* To work on and download existing project from GitHub:&lt;br /&gt;
** right-click on the PyDev Package Explorer, select the “Import” option, and in the “URI” box that pops up, paste the DataPro from GitHub link:&lt;br /&gt;
*** ''git@github.com:frankohanlon/DataPro.git'' (the other box should automatically fill up with corresponding text)&lt;br /&gt;
* To use/locate git commands from Aptana Studio 3:&lt;br /&gt;
** Right-click on the project, select Team and then the appropriate Git command.&lt;br /&gt;
* To upload new project to GITHUB from Aptana Studio 3:&amp;lt;br&amp;gt;&lt;br /&gt;
** (The following directions are modified from: https://aptanastudio.tenderapp.com/discussions/questions/1219-aptana-and-github )&lt;br /&gt;
# Create a new project&lt;br /&gt;
# Right-click on project...&amp;quot;Team &amp;gt; Share Project&amp;quot;. Commit your local contents to that repo&lt;br /&gt;
# Create a new Github repo&lt;br /&gt;
# From Aptana studio,  right-click &amp;quot;Add remote&amp;quot; and paste in the URL of your project&amp;lt;br\&amp;gt;(Team-&amp;gt; Remotes--&amp;gt;Add Remote) &lt;br /&gt;
# $ git status&lt;br /&gt;
# $ git add src/&lt;br /&gt;
# You have to follow up with  one manual step ATM. Type &amp;quot;git push -u origin master&amp;quot; in the console for the project&lt;br /&gt;
# You can now push your files up to Github.&lt;br /&gt;
&lt;br /&gt;
Notes from Bryan:	&lt;br /&gt;
 I once had a weird error..The error message was something like this:&lt;br /&gt;
 :error: src refspec master does not match any.&lt;br /&gt;
 :error: failed to push some refs to 'git@github ... .git'&lt;br /&gt;
 It was solved by executing the following commands:&lt;br /&gt;
 :$ touch README&lt;br /&gt;
 :$ git add README&lt;br /&gt;
 :$ git add (all other files)&lt;br /&gt;
 :$ git commit -m 'reinitialized files'&lt;br /&gt;
 :$ git push origin master --force&lt;/div&gt;</summary>
		<author><name>63.140.104.167</name></author>
		
	</entry>
	<entry>
		<id>http://ocotal.iarc.uaf.edu/index.php?title=Git_Tips&amp;diff=1817</id>
		<title>Git Tips</title>
		<link rel="alternate" type="text/html" href="http://ocotal.iarc.uaf.edu/index.php?title=Git_Tips&amp;diff=1817"/>
		<updated>2013-02-22T20:55:23Z</updated>

		<summary type="html">&lt;p&gt;63.140.104.167: &lt;/p&gt;
&lt;hr /&gt;
&lt;div&gt;==Some Online Resources:==&lt;br /&gt;
As specific questions come up you'll find more stuff via searching, I'm sure.&amp;lt;br&amp;gt;&lt;br /&gt;
http://try.github.com/levels/1/challenges/1&amp;lt;br&amp;gt;&lt;br /&gt;
http://git-scm.com/book/en/Git-Basics-Viewing-the-Commit-History&amp;lt;br&amp;gt;&lt;br /&gt;
http://rogerdudler.github.com/git-guide/&amp;lt;br&amp;gt;&lt;br /&gt;
http://ndpsoftware.com/git-cheatsheet.html&amp;lt;br&amp;gt;&lt;br /&gt;
http://git-scm.com/downloads&amp;lt;br&amp;gt;&lt;br /&gt;
http://www.sbf5.com/~cduan/technical/git/git-1.shtml&lt;br /&gt;
https://tiredblogger.wordpress.com/2009/11/09/creating-local-git-repositories-yeah-its-that-simple/&lt;br /&gt;
&lt;br /&gt;
==Settings More Global / General in Nature ==&lt;br /&gt;
Set up your name/ email address type stuff:&lt;br /&gt;
 $ git config --global user.email &amp;quot;me@here.com&amp;quot;&lt;br /&gt;
 $ git config --global user.name &amp;quot;Bob&amp;quot;&lt;br /&gt;
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:&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
e.g.&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Perl.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Python.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/R.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Global/Linux.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Global/OSX.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore/blob/master/Global/Windows.gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
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):&lt;br /&gt;
 $ gedit ~/.global_ignore &amp;amp; &lt;br /&gt;
 [Paste in content from the links above&lt;br /&gt;
 $ git config --global core.excludesfile ~/.global_ignore&lt;br /&gt;
If you screw up and add the wrong files to your project by accident in the initial setup, you can remove them like this:&lt;br /&gt;
 $ git rm *.pyc&lt;br /&gt;
 $ git rm --cached *.pyc&lt;br /&gt;
 $ git commit -am 'Accidentally added an excluded file type.. did not have .ignore configured yet'   &lt;br /&gt;
Then, check to see they're now excluded by listing all the files in version control:&lt;br /&gt;
 $ git ls-tree -r master --name-only&lt;br /&gt;
&lt;br /&gt;
Quick overview of commits that have been made:&lt;br /&gt;
 $ git log --pretty=format:&amp;quot;%h - %an, %ar : %s&amp;quot;&lt;br /&gt;
 8d8befa - Frank, 11 hours ago : relative paths set up for the initial configs&lt;br /&gt;
 1e0b20d - Frank, 17 hours ago : Initial commit of the super simple test run supplied by Scott.&lt;br /&gt;
&lt;br /&gt;
Oh, also, if you don't want to use ''nano'' as your default text editor here are another couple of options:&lt;br /&gt;
 $ git config --global core.editor &amp;quot;gedit&amp;quot;&lt;br /&gt;
 $ git config --global core.editor &amp;quot;vim&amp;quot;&lt;br /&gt;
 $ git config --global core.editor &amp;quot;mate -w&amp;quot;&lt;br /&gt;
&lt;br /&gt;
==Getting down to business with setting up and using a particular repository (Basic Usage)==&lt;br /&gt;
Now, let's set up a local repository and a remote one to push to / share with others.&amp;lt;br&amp;gt;&lt;br /&gt;
First, set up your local repo:&lt;br /&gt;
 $ cd /path/to/directory_to_enable_git_in/&lt;br /&gt;
 $ git init&lt;br /&gt;
 $ git add *&lt;br /&gt;
 $ git commit -am &amp;quot;first commit&amp;quot;&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
Next, set up a remote repository when you already have an existing one... in this case, the remote is in another folder, like a dropbox share:&lt;br /&gt;
e.g.&amp;lt;br&amp;gt;  http://stackoverflow.com/questions/1960799/using-gitdropbox-together-effectively&lt;br /&gt;
 $ cd ~/Dropbox/bob_n_bob/git/&lt;br /&gt;
 $ git init --bare erode_utilities.git&lt;br /&gt;
 $ cd ~/path/to/local_repo/&lt;br /&gt;
 $ git remote add origin ~/Dropbox/bob_n_bob/git/erode_utilities.git&lt;br /&gt;
 $ git remote set-url origin ~/Dropbox/bob_n_bob/git/erode_utilities.git&lt;br /&gt;
 $ git push -u origin master&lt;br /&gt;
&lt;br /&gt;
Say you typo the previous set up or your remote has a new location, you can change no problem from git:&amp;lt;br&amp;gt;&lt;br /&gt;
http://stackoverflow.com/questions/2432764/how-to-change-a-remote-repository-uri-using-git&lt;br /&gt;
 $ git remote add origin ~/dropbox/bob_n_bob/git/erode_clubfooted_typos_in_here.git   # oops!&lt;br /&gt;
 $ git remote set-url origin ~/dropbox/bob_n_bob/git/erode_correct_utilities.git      # this command corrects for the previous error&lt;br /&gt;
 $ git push -u origin master                                                          # now you can push your local repo to the remote.&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
Push local repo to your remote one (in this case, remote is a dropbox share):&lt;br /&gt;
 $ git push ~/Dropbox/bob_n_bob/git/busey_erode_inputs.git master&lt;br /&gt;
&lt;br /&gt;
==Incorporating Github as a remote repository==&lt;br /&gt;
&lt;br /&gt;
To deal with creating keys and using them with GitHub:&amp;lt;br&amp;gt;&lt;br /&gt;
https://help.github.com/articles/generating-ssh-keys&amp;lt;br&amp;gt;&lt;br /&gt;
&lt;br /&gt;
If you're using Github... and you mess up, post some private data (people pushing private keys to github was in the news in 2012 I think)&amp;lt;br&amp;gt;&lt;br /&gt;
https://help.github.com/articles/remove-sensitive-data&amp;lt;br&amp;gt;&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
-------------------------------------------------------------------------------------&lt;br /&gt;
==Windows Specific Notes==&lt;br /&gt;
To use Git from Aptana Studio 3:&amp;lt;br&amp;gt;&lt;br /&gt;
* (from Mozilla Firefox, not IE) install Aptana Studio 3:&lt;br /&gt;
** http://www.aptana.com/products/studio3/download&lt;br /&gt;
* Note that after installing Aptana Studio 3, it will have to be configured to use Pydev:		&lt;br /&gt;
** Under the windows menu in Aptana Studio, select ''preferences'' then select the ''python interpreter''.&lt;br /&gt;
** Under the windows menu in Aptana Studio, select ''Open Perspective'', then ''other'', then ''yDev''&lt;br /&gt;
** Keys will have to be created in the Git Bash window.&lt;br /&gt;
** Also from the GitBash window,  git init will need to be run from the desired workspace directory&lt;br /&gt;
** Some git configuring will be required from the Git Bash window (as shown above in the general git section):&lt;br /&gt;
*** git config --global user.email &amp;quot;me@here.com&amp;quot;&lt;br /&gt;
*** git config --global user.name &amp;quot;Your Name Comes Here&amp;quot;&lt;br /&gt;
* To work on and download existing project from GitHub:&lt;br /&gt;
** right-click on the PyDev Package Explorer, select the “Import” option, and in the “URI” box that pops up, paste the DataPro from GitHub link:&lt;br /&gt;
*** ''git@github.com:frankohanlon/DataPro.git'' (the other box should automatically fill up with corresponding text)&lt;br /&gt;
* To use/locate git commands from Aptana Studio 3:&lt;br /&gt;
** Right-click on the project, select Team and then the appropriate Git command.&lt;br /&gt;
* To upload new project to GITHUB from Aptana Studio 3:&amp;lt;br&amp;gt;&lt;br /&gt;
** (The following directions are modified from: https://aptanastudio.tenderapp.com/discussions/questions/1219-aptana-and-github )&lt;br /&gt;
# Create a new project&lt;br /&gt;
# Right-click on project...&amp;quot;Team &amp;gt; Share Project&amp;quot;. Commit your local contents to that repo&lt;br /&gt;
# Create a new Github repo&lt;br /&gt;
# From Aptana studio,  right-click &amp;quot;Add remote&amp;quot; and paste in the URL of your project&amp;lt;br\&amp;gt;(Team-&amp;gt; Remotes--&amp;gt;Add Remote) &lt;br /&gt;
# $ git status&lt;br /&gt;
# $ git add src/&lt;br /&gt;
# You have to follow up with  one manual step ATM. Type &amp;quot;git push -u origin master&amp;quot; in the console for the project&lt;br /&gt;
# You can now push your files up to Github.&lt;br /&gt;
&lt;br /&gt;
Notes from Bryan:	&lt;br /&gt;
 I once had a weird error..The error message was something like this:&lt;br /&gt;
 :error: src refspec master does not match any.&lt;br /&gt;
 :error: failed to push some refs to 'git@github ... .git'&lt;br /&gt;
 It was solved by executing the following commands:&lt;br /&gt;
 :$ touch README&lt;br /&gt;
 :$ git add README&lt;br /&gt;
 :$ git add (all other files)&lt;br /&gt;
 :$ git commit -m 'reinitialized files'&lt;br /&gt;
 :$ git push origin master --force&lt;/div&gt;</summary>
		<author><name>63.140.104.167</name></author>
		
	</entry>
	<entry>
		<id>http://ocotal.iarc.uaf.edu/index.php?title=Git_Tips&amp;diff=1816</id>
		<title>Git Tips</title>
		<link rel="alternate" type="text/html" href="http://ocotal.iarc.uaf.edu/index.php?title=Git_Tips&amp;diff=1816"/>
		<updated>2013-02-22T20:47:52Z</updated>

		<summary type="html">&lt;p&gt;63.140.104.167: &lt;/p&gt;
&lt;hr /&gt;
&lt;div&gt;==Some Online Resources:==&lt;br /&gt;
As specific questions come up you'll find more stuff via searching, I'm sure.&amp;lt;br&amp;gt;&lt;br /&gt;
http://try.github.com/levels/1/challenges/1&amp;lt;br&amp;gt;&lt;br /&gt;
http://git-scm.com/book/en/Git-Basics-Viewing-the-Commit-History&amp;lt;br&amp;gt;&lt;br /&gt;
http://rogerdudler.github.com/git-guide/&amp;lt;br&amp;gt;&lt;br /&gt;
http://ndpsoftware.com/git-cheatsheet.html&amp;lt;br&amp;gt;&lt;br /&gt;
http://git-scm.com/downloads&amp;lt;br&amp;gt;&lt;br /&gt;
http://www.sbf5.com/~cduan/technical/git/git-1.shtml&lt;br /&gt;
https://tiredblogger.wordpress.com/2009/11/09/creating-local-git-repositories-yeah-its-that-simple/&lt;br /&gt;
&lt;br /&gt;
==Settings More Global / General in Nature ==&lt;br /&gt;
Set up your name/ email address type stuff:&lt;br /&gt;
 $ git config --global user.email &amp;quot;me@here.com&amp;quot;&lt;br /&gt;
 $ git config --global user.name &amp;quot;Bob&amp;quot;&lt;br /&gt;
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:&amp;lt;br&amp;gt;&lt;br /&gt;
https://github.com/github/gitignore&amp;lt;br&amp;gt;&lt;br /&gt;
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):&lt;br /&gt;
 $ git config --global core.excludesfile ~/.global_ignore&lt;br /&gt;
If you screw up and add the wrong files to your project by accident in the initial setup, you can remove them like this:&lt;br /&gt;
 $ git rm *.pyc&lt;br /&gt;
 $ git rm --cached *.pyc&lt;br /&gt;
 $ git commit -am 'Accidentally added an excluded file type.. did not have .ignore configured yet'   &lt;br /&gt;
Then, check to see they're now excluded by listing all the files in version control:&lt;br /&gt;
 $ git ls-tree -r master --name-only&lt;br /&gt;
&lt;br /&gt;
Quick overview of commits that have been made:&lt;br /&gt;
 $ git log --pretty=format:&amp;quot;%h - %an, %ar : %s&amp;quot;&lt;br /&gt;
 8d8befa - Frank, 11 hours ago : relative paths set up for the initial configs&lt;br /&gt;
 1e0b20d - Frank, 17 hours ago : Initial commit of the super simple test run supplied by Scott.&lt;br /&gt;
&lt;br /&gt;
Oh, also, if you don't want to use ''nano'' as your default text editor here are another couple of options:&lt;br /&gt;
 $ git config --global core.editor &amp;quot;gedit&amp;quot;&lt;br /&gt;
 $ git config --global core.editor &amp;quot;vim&amp;quot;&lt;br /&gt;
 $ git config --global core.editor &amp;quot;mate -w&amp;quot;&lt;br /&gt;
&lt;br /&gt;
==Getting down to business with setting up and using a particular repository (Basic Usage)==&lt;br /&gt;
Now, let's set up a local repository and a remote one to push to / share with others.&amp;lt;br&amp;gt;&lt;br /&gt;
First, set up your local repo:&lt;br /&gt;
 $ cd /path/to/directory_to_enable_git_in/&lt;br /&gt;
 $ git init&lt;br /&gt;
 $ git add *&lt;br /&gt;
 $ git commit -am &amp;quot;first commit&amp;quot;&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
Next, set up a remote repository when you already have an existing one... in this case, the remote is in another folder, like a dropbox share:&lt;br /&gt;
e.g.&amp;lt;br&amp;gt;  http://stackoverflow.com/questions/1960799/using-gitdropbox-together-effectively&lt;br /&gt;
 $ cd ~/Dropbox/bob_n_bob/git/&lt;br /&gt;
 $ git init --bare erode_utilities.git&lt;br /&gt;
 $ cd ~/path/to/local_repo/&lt;br /&gt;
 $ git remote add origin ~/Dropbox/bob_n_bob/git/erode_utilities.git&lt;br /&gt;
 $ git remote set-url origin ~/Dropbox/bob_n_bob/git/erode_utilities.git&lt;br /&gt;
 $ git push -u origin master&lt;br /&gt;
&lt;br /&gt;
Say you typo the previous set up or your remote has a new location, you can change no problem from git:&amp;lt;br&amp;gt;&lt;br /&gt;
http://stackoverflow.com/questions/2432764/how-to-change-a-remote-repository-uri-using-git&lt;br /&gt;
 $ git remote add origin ~/dropbox/bob_n_bob/git/erode_clubfooted_typos_in_here.git   # oops!&lt;br /&gt;
 $ git remote set-url origin ~/dropbox/bob_n_bob/git/erode_correct_utilities.git      # this command corrects for the previous error&lt;br /&gt;
 $ git push -u origin master                                                          # now you can push your local repo to the remote.&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
Push local repo to your remote one (in this case, remote is a dropbox share):&lt;br /&gt;
 $ git push ~/Dropbox/bob_n_bob/git/busey_erode_inputs.git master&lt;br /&gt;
&lt;br /&gt;
==Incorporating Github as a remote repository==&lt;br /&gt;
&lt;br /&gt;
To deal with creating keys and using them with GitHub:&amp;lt;br&amp;gt;&lt;br /&gt;
https://help.github.com/articles/generating-ssh-keys&amp;lt;br&amp;gt;&lt;br /&gt;
&lt;br /&gt;
If you're using Github... and you mess up, post some private data (people pushing private keys to github was in the news in 2012 I think)&amp;lt;br&amp;gt;&lt;br /&gt;
https://help.github.com/articles/remove-sensitive-data&amp;lt;br&amp;gt;&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
-------------------------------------------------------------------------------------&lt;br /&gt;
==Windows Specific Notes==&lt;br /&gt;
To use Git from Aptana Studio 3:&amp;lt;br&amp;gt;&lt;br /&gt;
* (from Mozilla Firefox, not IE) install Aptana Studio 3:&lt;br /&gt;
** http://www.aptana.com/products/studio3/download&lt;br /&gt;
* Note that after installing Aptana Studio 3, it will have to be configured to use Pydev:		&lt;br /&gt;
** Under the windows menu in Aptana Studio, select ''preferences'' then select the ''python interpreter''.&lt;br /&gt;
** Under the windows menu in Aptana Studio, select ''Open Perspective'', then ''other'', then ''yDev''&lt;br /&gt;
** Keys will have to be created in the Git Bash window.&lt;br /&gt;
** Also from the GitBash window,  git init will need to be run from the desired workspace directory&lt;br /&gt;
** Some git configuring will be required from the Git Bash window (as shown above in the general git section):&lt;br /&gt;
*** git config --global user.email &amp;quot;me@here.com&amp;quot;&lt;br /&gt;
*** git config --global user.name &amp;quot;Your Name Comes Here&amp;quot;&lt;br /&gt;
* To work on and download existing project from GitHub:&lt;br /&gt;
** right-click on the PyDev Package Explorer, select the “Import” option, and in the “URI” box that pops up, paste the DataPro from GitHub link:&lt;br /&gt;
*** ''git@github.com:frankohanlon/DataPro.git'' (the other box should automatically fill up with corresponding text)&lt;br /&gt;
* To use/locate git commands from Aptana Studio 3:&lt;br /&gt;
** Right-click on the project, select Team and then the appropriate Git command.&lt;br /&gt;
* To upload new project to GITHUB from Aptana Studio 3:&amp;lt;br&amp;gt;&lt;br /&gt;
** (The following directions are modified from: https://aptanastudio.tenderapp.com/discussions/questions/1219-aptana-and-github )&lt;br /&gt;
# Create a new project&lt;br /&gt;
# Right-click on project...&amp;quot;Team &amp;gt; Share Project&amp;quot;. Commit your local contents to that repo&lt;br /&gt;
# Create a new Github repo&lt;br /&gt;
# From Aptana studio,  right-click &amp;quot;Add remote&amp;quot; and paste in the URL of your project&amp;lt;br\&amp;gt;(Team-&amp;gt; Remotes--&amp;gt;Add Remote) &lt;br /&gt;
# $ git status&lt;br /&gt;
# $ git add src/&lt;br /&gt;
# You have to follow up with  one manual step ATM. Type &amp;quot;git push -u origin master&amp;quot; in the console for the project&lt;br /&gt;
# You can now push your files up to Github.&lt;br /&gt;
&lt;br /&gt;
Notes from Bryan:	&lt;br /&gt;
 I once had a weird error..The error message was something like this:&lt;br /&gt;
 :error: src refspec master does not match any.&lt;br /&gt;
 :error: failed to push some refs to 'git@github ... .git'&lt;br /&gt;
 It was solved by executing the following commands:&lt;br /&gt;
 :$ touch README&lt;br /&gt;
 :$ git add README&lt;br /&gt;
 :$ git add (all other files)&lt;br /&gt;
 :$ git commit -m 'reinitialized files'&lt;br /&gt;
 :$ git push origin master --force&lt;/div&gt;</summary>
		<author><name>63.140.104.167</name></author>
		
	</entry>
</feed>