<h1>Initialize a new repository</h1>
<p>If you are using Github.com then this is the means of initializing a new remote repository. The repository is called “project1” in this example.</p>
<pre>
mkdir project1
cd project1
git init
touch README
git add README
git commit -m "Initialize"
git remote add origin git@github.com:andrewgilmartin/project1.git
</pre>
<h1>Cloning an existing remote repository</h1>
<p>Create a copy of the existing remote repository for local use.</p>
<pre>
git clone git@github.com:andrewgilmartin/project1.git
cd project1
</pre>
<h1>Branching</h1>
<p>Local work should be done on a branch. (Git branches are cheap.) Branch the master (or other major) line of development for the project</p>
<pre>
git checkout master
git branch b1
git checkout b1
...
git add ...
git commit -m "..."
git push origin b1
</pre>
<p>Delete the branch when you are done. Delete the remote and then the tracking branch:</p>
<pre>
git push origin :b1
git branch -D b1
</pre>
<p>Be <span class="caps">VERY</span> careful about using the colon! You can easily delete any line of development this way — even master.</p>
<h1>Normal use</h1>
<p>Work on branch b1:</p>
<pre>
git checkout b1
...
git add ...
git commit -m "..."
</pre>
<p>Rinse and repeat. Push your changes to the remote repository to save the intermediate changes:</p>
<pre>
git push origin b1
</pre>
<p>By not working on master you can make this kind of intermediate backup. It also allows you to share your project’s work with others.</p>
<h1>Merging a branch</h1>
<p>Merge branch b1’s changes into master:</p>
<pre>
git checkout master
git merge b1
git push origin master
</pre>
<h1>Fetching and merging remote repository updates</h1>
<pre>
git checkout master
git pull origin master
</pre>
<p>If you don’t checkout the master then the pull will be into the existing branch. Remember that pull is the same as (I think)</p>
<pre>
git fetch origin -v master
git merge master
</pre>
<p>Since this affects the current working directory make sure you have committed your branch changes first.</p>
<p><span class="caps">END</span></p>
2010-02-10T00:52:56-08:00
105355
git-notes
99163
Git notes
2009-01-05T07:07:59-08:00
19509