<?xml version="1.0" encoding="UTF-8"?><!-- generator="wordpress.com" -->
<rss version="2.0"
	xmlns:content="http://purl.org/rss/1.0/modules/content/"
	xmlns:wfw="http://wellformedweb.org/CommentAPI/"
	xmlns:dc="http://purl.org/dc/elements/1.1/"
	>

<channel>
	<title>git &amp;laquo; WordPress.com Tag Feed</title>
	<link>http://wordpress.com/tag/git/</link>
	<description>Feed of posts on WordPress.com tagged "git"</description>
	<pubDate>Sat, 11 Oct 2008 02:19:46 +0000</pubDate>

	<generator>http://wordpress.com/tags/</generator>
	<language>en</language>

<item>
<title><![CDATA[Git(ME)...]]></title>
<link>http://shawin06.wordpress.com/?p=110</link>
<pubDate>Thu, 09 Oct 2008 20:50:29 +0000</pubDate>
<dc:creator>shawin06</dc:creator>
<guid>http://shawin06.pt-br.wordpress.com/2008/10/09/gitme/</guid>
<description><![CDATA[

GiT derken ME ekleyemedım sonuna &#8230;
nasıl sızladı ıcım&#8230;
kan bıle akmadı dısler]]></description>
<content:encoded><![CDATA[<p><img class="alignnone size-medium wp-image-109" title="http://shawin06.files.wordpress.com/2008/10/a-27.jpg" src="http://shawin06.wordpress.com/files/2008/10/a-27.jpg?w=300" alt="" width="452" height="221" /></p>
<p><!--[if gte mso 9]&#62;  Normal 0   21   false false false  TR X-NONE X-NONE               MicrosoftInternetExplorer4              &#60;![endif]--><!--[if gte mso 9]&#62;                                                                                                                                            &#60;![endif]--></p>
<p class="MsoNormal" style="line-height:normal;"><strong><span style="font-size:12pt;font-family:&#34;">GiT derken ME ekleyemedım sonuna ...<br />
nasıl sızladı ıcım...<br />
kan bıle akmadı dıslerımın bırlestıgı dudaklarımdan<br />
tıtreyen elımde bır sıgara<br />
nedenlı ama bılıncsız atılan yumruklarım kaldı duvarlarda ...</span></strong></p>
<p class="MsoNormal" style="line-height:normal;"><strong><span style="color:#ff0000;">shawin...:(</span></strong></p>
<p class="MsoNormal" style="line-height:normal;"><span style="font-size:12pt;font-family:&#34;"> </span></p>
<p class="MsoNormal" style="line-height:normal;"><span style="color:#ff0000;"><strong><span style="font-size:12pt;font-family:&#34;"><br />
</span></strong></span></p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[The fastest way to migrate your Subversion repository to Git]]></title>
<link>http://onruby.wordpress.com/?p=42</link>
<pubDate>Thu, 09 Oct 2008 10:37:43 +0000</pubDate>
<dc:creator>jan</dc:creator>
<guid>http://onruby.pt-br.wordpress.com/2008/10/09/the-fastest-way-to-migrate-your-subversion-repository-to-git/</guid>
<description><![CDATA[Just svn export checkouts of tags/branches you use and trunk and create branches for them in the new]]></description>
<content:encoded><![CDATA[<p>Just <em>svn export</em> checkouts of tags/branches you use and trunk and create branches for them in the new Git repository. How often do you need anything from the history apart from the above? Let me rephrase: How often do you need to find the culprit instead of concentrating on fixing the problem?</p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Instalar el ULTIMO compiz-fusion desde la GIT FACILMENTE!]]></title>
<link>http://powerlinuxusers.wordpress.com/?p=3</link>
<pubDate>Thu, 09 Oct 2008 03:27:24 +0000</pubDate>
<dc:creator>powerlinuxusers</dc:creator>
<guid>http://powerlinuxusers.pt-br.wordpress.com/2008/10/09/instalar-el-ultimo-compiz-fusion-desde-la-git-facilmente/</guid>
<description><![CDATA[Bueno muchachos, yo se que muchos andan buscando esto y se creen que es muy complicado, asique me de]]></description>
<content:encoded><![CDATA[<p>Bueno muchachos, yo se que muchos andan buscando esto y se creen que es muy complicado, asique me decidi a redactar un tutorial para ustedes los entusiastas de los efectos en 3D de Linux, y que les encanta tener lo ultimo de lo ultimo, en este caso, <em><strong>COMPIZ-FUSION</strong></em> y, alegrense los que no se llevan con la linea de comandos! porque ahora tenemos una GUI (para los muy muy nuevos, eso quiere decir un software con una ventana grafica que ayuda a que tenga una forma "mas sencilla" de utilizarlo.).</p>
<p><em><strong>NOTA: Que esten usando la ultima de las versiones, quiere decir que van a tener MAS EFECTOS (es decir, MAS PLUGINS) pero tambien que este se puede comportar un poco inestable.</strong></em></p>
<p>Para instalar Compiz-fusion desde su GIT, lo que vamos a hacer es tomar ventaja de una utilidad muy linda escrita en python, que se llama <em><strong>FusionBuild</strong></em>. que se va a encargar por nosotos de descargar los archivos correspondientes. Y esta de mas decir que si quieren agregar algun parametro para OPTIMIZARLO y hacer que "ande mas rapido" o "consuma menos memoria" van a tener que agregarlo al Makefile, y eso tambien va a depender de su hardware y de la distro que esten usando :). De cualquier manera no es complicado, y quisiera saber si ustedes quisieran que ponga un tutorial sobre eso.</p>
<p>Bueno, para comenzar vamos a tener que descargar el codigo fuente (como siempre, tienen un tar.gz o un tar-bz2) y descomprimirlo.</p>
<p>Para descargarlo, pueden hacerlo desde este enlaze:<em><strong> (NOTA: Si estan en una consola y les resulta comodo, es altamente recomendable que usen WGET, porque es rapido, es efectivo, es a mi forma de verlo uno de los mejores gestores de descarga (menos para rapidshare/megaupload/ya_comprenden_la_onda :P)</strong></em></p>
<p>Descarguen Fusion-build desde aca: http://fusionbuild.wordpress.com/download/ (seleccionen la ultima version, o al menos la ultima estable)</p>
<p>Una vez hecho esto,lo descomprimen, y lo ejecutan en una consola o con algun launcher usando:</p>
<p><strong><em>python fusionbuild</em></strong> (Obviamente especificando delante de fusionbuild el directorio donde lo pusieron)</p>
<p>Por ejemplo, si descargaron el archivo en ~/fusionbuild y lo descomprimieron, van a tener una carpeta ahi dentro, y dentro de esa va a estar el script de python que necesitan.</p>
<p>NOTA: ~/ es lo mismo que el HOME de tu usuario, pueden ver el contenido de ~/ haciendo <em><strong>echo $HOME</strong></em>.</p>
<p>Despues de eso, tienen que configurar su Xorg.conf (en /etc/X11/xorg.conf por lo general) y agregar la categoria Composite, no olviden usar sus drivers / modulos con aceleracion 3D porque los otros no les va a funcinoar, no soportan esa clase de cosas, pero eso, ya va para otra entrada :P, Si alguien quiera que escriba un tuto para alguna distro en especifico (como Gentoo, Oh! Mi amado Gentoo!) me avisan :)</p>
<p>Lo que tienen que agregar (al final de su xorg.conf) es:</p>
<p><em><strong>Section "Extensions"<br />
Option      "Composite"   "enable"<br />
EndSection<br />
</strong></em></p>
<p>Ademas, en este sitio web pueden encontrar algunas cosas que pueden reducir un poco el uso de memoria de compiz-fusion aunque tambien reduzcan su integracion:</p>
<p>http://wiki.compiz-fusion.org/Installation</p>
<p>Les recomiendo que visiten su sitio y el de su distro para mas informacion, pero no hay problema en que me la pidan.</p>
<p>Eso ha sido, todo, discupen por escribirlo a las apuradas, este es el primer post y espero que les guste ;)</p>
<p>ESPERO MUCHO FEEDBACK! Asique posteen comentarios!</p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Gentoo on a kvm guest]]></title>
<link>http://treggats.wordpress.com/?p=62</link>
<pubDate>Wed, 08 Oct 2008 19:42:18 +0000</pubDate>
<dc:creator>Treggats</dc:creator>
<guid>http://treggats.pt-br.wordpress.com/2008/10/08/gentoo-on-a-kvm-guest/</guid>
<description><![CDATA[A simple misstep can ruin your Gentoo installation.
While I was trying to install a taxprogram I thi]]></description>
<content:encoded><![CDATA[<p>A simple misstep can ruin your Gentoo installation.</p>
<p>While I was trying to install a taxprogram I think I messed up my /usr, got all sorts of 'Permission Denied' so I decided to reinstall Gentoo.<br />
Which didn't go fast enough because I needed my laptop for school use. So I decided to install Sabayon, but that didn't go so well. So in the end I decided to install fedora 9 which runs nice and smooth.<br />
But I longed back for Gentoo, that when I installed KVM and I started with my Gentoo install.</p>
<p>I used the stage3 from www.funtoo.org/linux and the portage tree from www.github.com/funtoo<br />
At the moment I intend to create a solid base-system with all my needs and create a stage4. I hope Daniel Robbins his stage-create-tool a.k.a. Metro is finished before I get to that stage :P</p>
<p>Anyway I'm just done with getting rid of circular dependencies. I'm now rebuilding the system with enabled USE-flags<br />
After that I'll review all the USE-flags and adjusting /etc/make.conf &#124;&#124; /etc/portage/package.use accordingly<br />
And when I'm done rebuilding those packages I'll move to emerging X</p>
<p>Sounds like I'm not done yet.. And to make it more interesting it's all in kvm.</p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Synchronize git repositories between deskop and laptop]]></title>
<link>http://davitenio.wordpress.com/?p=57</link>
<pubDate>Wed, 08 Oct 2008 09:35:45 +0000</pubDate>
<dc:creator>davitenio</dc:creator>
<guid>http://davitenio.pt-br.wordpress.com/2008/10/08/synchronize-git-repositories-between-deskop-and-laptop/</guid>
<description><![CDATA[I sometimes work on my laptop and sometimes on my desktop computer. This is a
little demonstration s]]></description>
<content:encoded><![CDATA[<p>I sometimes work on my laptop and sometimes on my desktop computer. This is a<br />
little demonstration showing how I synchronize the repository on the laptop<br />
with the repository on the desktop.</p>
<p>Let's say I originally created my git repository on the laptop:</p>
<pre>
david@laptop$ mkdir ~/repo
david@laptop$ cd !$
david@laptop$ git init
david@laptop$ echo "hello world" &#62; hello.txt
david@laptop$ git add hello.txt
david@laptop$ git commit -m 'Added hello world'
</pre>
<p>To continue to work on my desktop I'll just clone the repository on my desktop:</p>
<pre>
david@desktop$ git clone ssh://192.168.0.42/home/david/repo
david@desktop$ cd repo
</pre>
<p>Let's say I do some commits on the desktop now:</p>
<pre>
david@desktop$ for i in $(seq 5); do echo $i &#62;&#62; hello.txt; \
git commit -am "added $i"; done
</pre>
<p>Now I can simply push them back to the laptop:</p>
<pre>
david@desktop$ git push
</pre>
<p>Let's go back to the laptop now:</p>
<pre>
david@laptop$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD ..." to unstage)
#
#	modified:   hello.txt
#
</pre>
<p>We notice it say's the file has been modified. The reason is that the previous<br />
push from the laptop didn't update the working directory, as a diff shows:</p>
<pre>
david@laptop$ git diff --cached
diff --git a/hello.txt b/hello.txt
index 1c8a100..3b18e51 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,6 +1 @@
 hello world
-1
-2
-3
-4
-5
</pre>
<p>So we'll just checkout the version that has been pushed previously:</p>
<pre>
david@laptop$ git checkout -f HEAD
</pre>
<p>Let's do some work on the laptop:</p>
<pre>
david@laptop$ git checkout -b dev
david@laptop$ echo "this is a new file" &#62; new.txt
david@laptop$ git add new.txt
david@laptop$ git commit -m 'Added new file'
david@laptop$ git checkout master
david@laptop$ echo "6" &#62;&#62; hello.txt
david@laptop$ git commit -am 'Added 6'
</pre>
<p>Now to push those changes to the desktop we have to add the desktop as a remote.</p>
<pre>
david@laptop$ git remote add desktop ssh://192.168.0.12/home/david/repo
david@laptop$ git push desktop
</pre>
<p>This will push the latest changes in the master branch. To push the dev branch:</p>
<pre>
david@laptop$ git push desktop dev
</pre>
<p>Now let's rebase dev onto master:</p>
<pre>
david@laptop$ git rebase master dev
</pre>
<p>With the rebase we went from:</p>
<pre>
hello -- added 1 -- added 3 -- added 4 -- added 5 -- added 6   &#60;-- master
                                              \
                                              added new file  &#60;-- dev
</pre>
<p>To:</p>
<pre>
hello -- added 1 -- added 3 -- added 4 -- added 5 -- added 6   &#60;-- master
                                                         \
                                                         added new file  &#60;-- dev
</pre>
<p>If we now try to push from the laptop to the desktop it will fail:</p>
<pre>
david@laptop$ git push desktop dev
david@192.168.0.12's password:
To ssh://192.168.0.12/home/david/repo
 ! [rejected]        dev -&#62; dev (non-fast forward)
error: failed to push some refs to 'ssh://192.168.0.12/home/david/repo'
</pre>
<p>The reason is that it is not a fast forward push, so what we have to do to push<br />
anyway is force the push:</p>
<pre>
david@laptop$ git push desktop dev -f
</pre>
<p>In summary, if you have done some changes which result in a non-fast forward<br />
push you can push those change anyway using the '-f' switch.</p>
<p>WARNING: Non-fast forward pushes are disabled by default to prevent you from<br />
losing changes that are on the remote repository and that are not in your local<br />
repository. If you do accidentally lose some changes on the remote end, you can<br />
log on to the remote machine, use git reflog to find the commit that was the<br />
HEAD before the forced push was executed and establish that commit as the HEAD<br />
again using git reset --hard.</p>
<p>Now let's see what happens if you try to do a non-fast forward pull. First<br />
we'll have to do some changes that will result into a non-fast forward merge.<br />
For instance, let's squash some commits using interactive rebase:</p>
<pre>
david@laptop$ git checkout master
david@laptop$ git log --pretty=oneline
3003e24db3933cdcf0b337efee105bb8d5fab162 Added 6
addeee530032c74354b119fd0afd5370ebcec744 added 5
94c3719981b10553b3dba4d34c56c4c383769bee added 4
8ed90f1eb2bafc66a238b2fff3a85e579f782b3c added 3
c499db8d72aab61eb275d38df72bcaddb3a5e263 added 2
5fd3b26ffcdd611e6f58e5ec4a7ed8ce34ffe546 added 1
0efc99fff3e258961c321b529930bc56c5d91c39 Added hello world
david@laptop$ git rebase -i master~6
</pre>
<p>Your editor will be opened with the following contents:</p>
<pre>
pick 5fd3b26 added 1
pick c499db8 added 2
pick 8ed90f1 added 3
pick 94c3719 added 4
pick addeee5 added 5
pick 3003e24 Added 6

# Rebase 0efc99f..3003e24 onto 0efc99f
#
# Commands:
#  pick = use commit
#  edit = use commit, but stop for amending
#  squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
</pre>
<p>Now let's squash some commits:</p>
<pre>
pick 5fd3b26 added 1
pick c499db8 added 2
pick 8ed90f1 added 3
squash 94c3719 added 4
squash addeee5 added 5
squash 3003e24 Added 6

# Rebase 0efc99f..3003e24 onto 0efc99f
#
# Commands:
#  pick = use commit
#  edit = use commit, but stop for amending
#  squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
</pre>
<p>Save and quit and your editor will open again for a new commit message. Edit<br />
the new commit message, save and quit. Now the log should look similar to this:</p>
<pre>
david@laptop$ git log --pretty=oneline
857596e692c7fd98d019dae2630dc320f5c95177 added 3 added 4 added 5 Added 6
c499db8d72aab61eb275d38df72bcaddb3a5e263 added 2
5fd3b26ffcdd611e6f58e5ec4a7ed8ce34ffe546 added 1
0efc99fff3e258961c321b529930bc56c5d91c39 Added hello world
</pre>
<p>Now let's go back to the desktop and see what happens if we do a pull now:</p>
<pre>
david@desktop$ git co -f master
david@desktop$ git pull
david@desktop$ git log --pretty=oneline
c4b80bae8d6a86373fac45e16c89608a6009e8fc Merge branch 'master' of ssh://192.168.0.42/home/david/repo
857596e692c7fd98d019dae2630dc320f5c95177 added 3 added 4 added 5 Added 6
3003e24db3933cdcf0b337efee105bb8d5fab162 Added 6
c499db8d72aab61eb275d38df72bcaddb3a5e263 added 2
addeee530032c74354b119fd0afd5370ebcec744 added 5
5fd3b26ffcdd611e6f58e5ec4a7ed8ce34ffe546 added 1
94c3719981b10553b3dba4d34c56c4c383769bee added 4
8ed90f1eb2bafc66a238b2fff3a85e579f782b3c added 3
0efc99fff3e258961c321b529930bc56c5d91c39 Added hello world
</pre>
<p>As you can see the pull doesn't rewrite the history, i.e. the log looks<br />
different now on the laptop and on the desktop. I find that confusing, I'd<br />
prefer having the same commit history on all my machines. Let's undo that last pull:</p>
<pre>
david@desktop$ git reset --hard HEAD^
david@desktop$ git log --pretty=oneline
3003e24db3933cdcf0b337efee105bb8d5fab162 Added 6
addeee530032c74354b119fd0afd5370ebcec744 added 5
94c3719981b10553b3dba4d34c56c4c383769bee added 4
8ed90f1eb2bafc66a238b2fff3a85e579f782b3c added 3
c499db8d72aab61eb275d38df72bcaddb3a5e263 added 2
5fd3b26ffcdd611e6f58e5ec4a7ed8ce34ffe546 added 1
0efc99fff3e258961c321b529930bc56c5d91c39 Added hello world
</pre>
<p>What I'd like to do is something equivalent to a push --force but with a pull.<br />
The solution is using the plus sign with pull:</p>
<p>WARNING: The same caution as to a push --force applies, you can loose changes<br />
that are on your local repository but not on the remote repository when using a<br />
pull with the plus sign. Although, like in the previous warning, you can<br />
probably use git reflog and git reset --hard to get those changes back.</p>
<pre>
david@desktop$ git pull origin +master:master
</pre>
<p>The first master references the remote master branch and the second references<br />
the local master branch. If we now look at the commit history we can see that<br />
it is the same as on the laptop:</p>
<pre>
david@desktop$ git log --pretty=oneline
857596e692c7fd98d019dae2630dc320f5c95177 added 3 added 4 added 5 Added 6
c499db8d72aab61eb275d38df72bcaddb3a5e263 added 2
5fd3b26ffcdd611e6f58e5ec4a7ed8ce34ffe546 added 1
0efc99fff3e258961c321b529930bc56c5d91c39 Added hello world
</pre>
<p>In summary, the equivalent pull operation to a "git push --force" is a pull<br />
using the plus sign.</p>
<p>Finally one more WARNING: do not force push to repositories from which other<br />
people have already pulled as that may cause problems for them. See <a href="http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#problems-with-rewriting-history"><br />
problems with rewriting history</a> in the git manual.</p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Fidgit-Straight Up Gaming News]]></title>
<link>http://epicponyz.wordpress.com/?p=1744</link>
<pubDate>Mon, 06 Oct 2008 21:04:34 +0000</pubDate>
<dc:creator>epicponyz</dc:creator>
<guid>http://epicponyz.com/2008/10/06/fidgit-straight-up-gaming-news/</guid>
<description><![CDATA[
While searching around the internet, I came across this website that it actually really good. I, my]]></description>
<content:encoded><![CDATA[<p><a href="http://fidgit.com/"><img class="alignnone size-full wp-image-1745" title="fidgit" src="http://epicponyz.wordpress.com/files/2008/10/fidgit.jpg" alt="" width="398" height="264" /></a></p>
<p>While searching around the internet, I came across this website that it actually really good. I, myself, am someone who loves to keep up on gaming news. Usually I like to use a few independent gaming news sites, and <a href="http://www.kotaku.com">Kotaku</a>. Today I present to you a gaming website that hasn't really been around that long. It is "Powered by Sci-Fi". Check it out, as it updates hourly. Great site, strongly suggest you bookmark it.</p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Bazaar: Version Control System]]></title>
<link>http://rapd.wordpress.com/?p=375</link>
<pubDate>Mon, 06 Oct 2008 06:12:19 +0000</pubDate>
<dc:creator>didip</dc:creator>
<guid>http://rapd.pt-br.wordpress.com/2008/10/05/bazaar-version-control-system/</guid>
<description><![CDATA[There are numerous distributed Version Control systems nowadays. There are Git, Mercurial, and Baza]]></description>
<content:encoded><![CDATA[<p>There are numerous distributed Version Control systems nowadays. There are <a href="http://en.wikipedia.org/wiki/Git_(software)" target="_blank">Git</a>, <a href="http://en.wikipedia.org/wiki/Mercurial_(software)" target="_blank">Mercurial</a>, and <a href="http://en.wikipedia.org/wiki/Bazaar_(software)" target="_blank">Bazaar</a>.</p>
<p>From first impression, I like Bazaar, here's why:</p>
<ul>
<li>It's written in Python.</li>
<li>Furthermore, because it is written in Python, installation is a breeze: <em>`easy_install bzr`</em></li>
<li>It has similar terminology to SVN. That means lower learning curve.</li>
<li>Bazaar has really good storage compression. See the comparisons that others have done below.</li>
</ul>
<p><strong>Bit of History:</strong></p>
<p><a href="http://sourcefrog.net/weblog/personal/at-canonical.html" target="_blank">Martin Pool started Bazaar</a> when he was just hired by Canonical, ltd.</p>
<p> </p>
<p><strong>List of Projects using Bazaar[</strong><a href="http://bazaar-vcs.org/WhoUsesBzr" target="_blank"><strong>link</strong></a><strong>]:</strong></p>
<p><em>Below is not the complete list, see link above for more.</em></p>
<ul>
<li>Bugzilla@Mozilla</li>
<li>GNU Mailman</li>
<li>MySQL</li>
<li><a href="http://www.squid-cache.org/" target="_blank">Squid</a> - Caching Proxy project. It caches frequently visited web pages.</li>
</ul>
<p>Others have attempted to compare Bazaar vs Git:</p>
<ul>
<li><a href="http://blog.jozilla.net/2006/03/03/bzr-versus-git/" target="_blank">http://blog.jozilla.net/2006/03/03/bzr-versus-git/</a></li>
<li><a href="http://laserjock.wordpress.com/2008/05/08/git-and-bzr-historical-performance-comparison/" target="_blank">http://laserjock.wordpress.com/2008/05/08/git-and-bzr-historical-performance-comparison/</a></li>
</ul>
<p> </p>
<p><strong>References:</strong></p>
<ul>
<li><a href="http://bazaar-vcs.org/" target="_blank">Bazaar Main Page</a></li>
<li><a href="http://jam-bazaar.blogspot.com/" target="_blank">John Arbash Meinel (Bazaar's developer) blog</a></li>
<li><a href="http://en.wikipedia.org/wiki/Bazaar_(software)" target="_blank">Wikipedia - Bazaar</a></li>
<li><a href="http://en.wikipedia.org/wiki/Git_(software)" target="_blank">Wikipedia - Git</a></li>
<li><a href="http://en.wikipedia.org/wiki/Mercurial_(software)" target="_blank">Wikipedia - Mercurial</a></li>
</ul>
]]></content:encoded>
</item>
<item>
<title><![CDATA[External git merge on OS X]]></title>
<link>http://afreshcup.wordpress.com/?p=455</link>
<pubDate>Sun, 05 Oct 2008 14:58:43 +0000</pubDate>
<dc:creator>Mike Gunderloy</dc:creator>
<guid>http://afreshcup.pt-br.wordpress.com/2008/10/05/external-git-merge-on-os-x/</guid>
<description><![CDATA[The default merging behavior of git is pretty good - until it blows chunks and litters your merged f]]></description>
<content:encoded><![CDATA[<p>The default merging behavior of git is pretty good - until it blows chunks and litters your merged file with dozens of &#62;&#62;&#62;&#62; markers. I had this happen to me again this weekend, and was finally motivated to do something about it.</p>
<p>To change the default merging behavior in git, you run</p>
<p>git config --global merge.tool <em>toolname</em></p>
<p>To see the list of available tools, type</p>
<p>git mergetool</p>
<p>Most of the tools that git understands are unix-y. There is one OS X tool on the list: opendiff, which launches the FileMerge tool. But honestly, I've never been that impressed with FileMerge's merge algorithm.</p>
<p>Fortunately, xxdiff is a pretty good tool, and it's available as a <a href="http://xxdiff.darwinports.com/">Darwin port</a>. So, assuming you already have your OS X box set up to install ports, you can have this as your default git merge user interface by running:</p>
<p>sudo port install xxdiff<br />
git config --global merge.tool xxdiff</p>
<p>Now files needing a merge will open in the xxdiff user interface - which is an ugly XWindows thing, but it's powerful. I'd love to see git hook up to something like Araxis Merge or Changes (when their 2.0 version with 3-way merge comes out), but I'm not nearly motivated enough to hack around in the git source yet.</p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[anak TK..temenin nna ikutan GIT yaa?]]></title>
<link>http://blogsabrina.wordpress.com/?p=236</link>
<pubDate>Sat, 04 Oct 2008 11:44:34 +0000</pubDate>
<dc:creator>blogsabrina</dc:creator>
<guid>http://blogsabrina.pt-br.wordpress.com/2008/10/04/anak-tktemenin-nna-ikutan-git-yaa/</guid>
<description><![CDATA[teh ita (10/4/2008 11:43:20 AM): iinaaaa
teh ita (10/4/2008 11:43:29 AM): sdh mngunduh buku2?
nna (1]]></description>
<content:encoded><![CDATA[<p><em>teh ita (10/4/2008 11:43:20 AM): iinaaaa<br />
teh ita (10/4/2008 11:43:29 AM): sdh mngunduh buku2?<br />
nna (10/4/2008 11:43:34 AM): adapa teh?<br />
nna (10/4/2008 11:43:44 AM): blom,<br />
teh ita (10/4/2008 11:43:59 AM): oo..<br />
nna (10/4/2008 11:44:02 AM): ternyata na blom ikut milis krnkitakluarga</em></p>
<p><em>nna (10/4/2008 11:44:03 AM): :D</em></p>
<p><em><br />
teh ita (10/4/2008 11:44:06 AM): udah puny y?<br />
nna (10/4/2008 11:44:21 AM): blom teh,,<br />
nna (10/4/2008 11:44:30 AM): buku apa sih teh?pnasaran.<br />
teh ita (10/4/2008 11:44:36 AM): yeee<br />
teh ita (10/4/2008 11:44:42 AM): unduhlah<br />
nna (10/4/2008 11:44:51 AM): dimilis kan?<br />
nna (10/4/2008 11:44:58 AM): na baru join milisnya kemaren,,<br />
teh ita (10/4/2008 11:44:59 AM): trilogi yusuf ardiansyah<br />
teh ita (10/4/2008 11:45:09 AM): ho oh<br />
nna (10/4/2008 11:45:17 AM): bisa dimana downloadnya?<br />
nna (10/4/2008 11:45:31 AM): ntar deh,<br />
teh ita (10/4/2008 11:45:33 AM): d milis<br />
teh ita (10/4/2008 11:45:44 AM): okeh<br />
nna (10/4/2008 11:45:51 AM): na cek,,,moderatornya da ngeapprove apa blom,<br />
teh ita (10/4/2008 11:45:59 AM): akan kuteror terus dirimu,ok?<br />
nna (10/4/2008 11:46:05 AM): oke<br />
nna (10/4/2008 11:46:12 AM): teh aku teh lagi sakit<br />
nna (10/4/2008 11:46:21 AM): pusing..pilek,,lemas,,banyak PR.<br />
teh ita (10/4/2008 11:46:21 AM): ehehehe<br />
teh ita (10/4/2008 11:46:28 AM): aduh,ina<br />
nna (10/4/2008 11:46:40 AM): sekarang aja ditinggal dirumah ama yang laen,<br />
teh ita (10/4/2008 11:46:49 AM): makany jgn lngsung bls dndam<br />
nna (10/4/2008 11:46:55 AM): heu<br />
nna (10/4/2008 11:46:58 AM): pilekk..<br />
nna (10/4/2008 11:47:25 AM): blom di approv ma moderatornya,<br />
teh ita (10/4/2008 11:47:46 AM): yah<br />
teh ita (10/4/2008 11:48:39 AM): sabar y</em></p>
<p>dan pada siangnya..status YM na gini.</p>
<p><strong>karenakitakeluarga</strong></p>
<p><strong>Membership is Pending</strong></p>
<p><strong>19 New Messages<br />
</strong></p>
<p><strong>3 New Members<br />
</strong></p>
<p><strong>22 New Files</strong></p>
<p>niatnya sih, ada anak G yang tau siapa moderatornya trus bisa berbaik hati ngasi tau moderatorny karena na yakin..anak G kan baikbaik..</p>
<p>eh.ternyata ada yang membantuu.</p>
<p><em>teh shinta (10/4/2008 4:10:47 PM): Statusny knp tuh na??<br />
nna (10/4/2008 4:11:09 PM): yah,syapa tau ada yang kenal sama moderatornya karenakitakeluarga..<br />
nna (10/4/2008 4:11:20 PM): karena,,na mau download sesuatu disana..<br />
nna (10/4/2008 4:11:22 PM): tetehh..<br />
nna (10/4/2008 4:11:28 PM): mohon maaf lahir bathin yaa.<br />
teh shinta (10/4/2008 4:11:37 PM): Ke kak adit aja atuh<br />
nna (10/4/2008 4:11:37 PM): teteh ada Fb yaa?mau add dong,<br />
teh shinta (10/4/2008 4:11:58 PM): Ada si.. Tp gk prnh diapa2in tuh<br />
nna (10/4/2008 4:12:06 PM): na add yaa.<br />
nna (10/4/2008 4:12:08 PM): namanya apa,<br />
teh shinta (10/4/2008 4:12:14 PM): Sama2 y,,mhn maaf lahir batin jg<br />
teh shinta (10/4/2008 4:12:43 PM): Shinta.. xxxxxxxxxxx@yahoo.com<br />
teh shinta (10/4/2008 4:13:14 PM): Mw download apa emgny? Pnting bgt gk?<br />
nna (10/4/2008 4:13:36 PM): hmm.<br />
nna (10/4/2008 4:13:38 PM): itutuh<br />
nna (10/4/2008 4:13:39 PM): GIT<br />
nna (10/4/2008 4:13:48 PM): Gamais Training apaa gtu..<br />
teh shinta (10/4/2008 4:14:16 PM): Oo..<br />
teh shinta (10/4/2008 4:14:26 PM): Mw pake akun saya aj?<br />
nna (10/4/2008 4:14:35 PM): wah.<br />
nna (10/4/2008 4:14:40 PM): jadi ga enak,<br />
teh shinta (10/4/2008 4:15:26 PM): Gpp koq..<br />
teh shinta (10/4/2008 4:15:27 PM): Gmn? Mw gk?<br />
nna (10/4/2008 4:16:03 PM): boleh deh.<br />
nna (10/4/2008 4:16:06 PM): hehe.<br />
teh shinta (10/4/2008 4:16:31 PM): Id : XXXXXXXXXXXX<br />
teh shinta (10/4/2008 4:16:37 PM): Pass : XXXXXXXXXXXX<br />
nna (10/4/2008 4:17:43 PM): fbnya dah di add teh,,</em></p>
<p>wah,,alhamdulillah,,heuheu.</p>
<p>bisa juga di doenload walaupun dengan akun orang,,</p>
<p>dan na lagi YM ma seorang akhi,</p>
<p>nna (10/4/2008 4:17:11 PM): itu ikutan GIT ga?<br />
XXXXXs (10/4/2008 4:17:41 PM): apa tuh??<br />
nna (10/4/2008 4:17:53 PM): Gamais Training apaa gtu..<br />
nna (10/4/2008 4:17:56 PM): ikutan gih,<br />
nna (10/4/2008 4:18:15 PM): kya klompok2 gtu.<br />
nna (10/4/2008 4:18:28 PM): mau ikut klopok aku?<br />
nna (10/4/2008 4:18:34 PM): na klompok 2.<br />
nna (10/4/2008 4:18:43 PM): na klompok 4 deng,<br />
nna (10/4/2008 4:19:01 PM): PJnya teh ita sama kak Tusi<br />
nna (10/4/2008 4:19:16 PM): klo kelompok 2 pjnya kak ryan TM,<br />
nna (10/4/2008 4:19:21 PM): gtugtu lah,<br />
nna (10/4/2008 4:19:30 PM): kyanya emang publikasinya kurrang ya.<br />
XXXXXs (10/4/2008 4:19:36 PM): ma sapa ajah??<br />
nna (10/4/2008 4:19:40 PM): gatau na juga<br />
nna (10/4/2008 4:19:59 PM): dan na ceritanya blom masuk milis karenakitakeluarga<br />
nna (10/4/2008 4:20:06 PM): padahal ada tugas liburan,<br />
XXXXXs (10/4/2008 4:20:29 PM): owh<br />
XXXXXs (10/4/2008 4:20:37 PM): ga kedengeran tuh<br />
XXXXXs (10/4/2008 4:20:41 PM): ntar liat deh<br />
XXXXXs (10/4/2008 4:20:50 PM): gi sibuk diospek nih</p>
<p>&#124;<br />
&#124;</p>
<p>ngasih ke si akhi itu filefile GIT<br />
&#124;<br />
XXXXXs (10/4/2008 4:56:42 PM): tapi kalo mw daftar gimna??<br />
nna (10/4/2008 4:58:00 PM): kmu maunya ikut klompok mana,,<br />
nna (10/4/2008 4:58:04 PM): sms aja ketuanya<br />
XXXXXs (10/4/2008 5:00:49 PM): kelompok 6 kalo jadi<br />
nna (10/4/2008 5:01:49 PM): sip<br />
XXXXXs (10/4/2008 5:02:14 PM): sipp</p>
<p>dan...</p>
<p>asik..asik..baca2 filenya,,tersadar..ingin mencari teman seperjuangan..</p>
<p>hmm..</p>
<p><a href="http://blogsabrina.files.wordpress.com/2008/10/untitled1.jpg"><img class="alignnone size-full wp-image-240" title="untitled1" src="http://blogsabrina.wordpress.com/files/2008/10/untitled1.jpg" alt="" /></a></p>
<p>then..</p>
<p><a href="http://blogsabrina.files.wordpress.com/2008/10/tk1.jpg"><img class="alignnone size-full wp-image-241" title="tk1" src="http://blogsabrina.wordpress.com/files/2008/10/tk1.jpg" alt="" width="409" height="242" /></a></p>
<p>OK!</p>
<p><a href="http://blogsabrina.files.wordpress.com/2008/10/hah1.jpg"><img class="alignnone size-full wp-image-242" title="hah1" src="http://blogsabrina.wordpress.com/files/2008/10/hah1.jpg" alt="" /></a></p>
<p>hah?yang lain kmanaa...</p>
<p>temann...temani aku..</p>
<p><img src="/DOCUME~1/Sabrina/LOCALS~1/Temp/moz-screenshot.jpg" alt="" /><img src="/DOCUME~1/Sabrina/LOCALS~1/Temp/moz-screenshot-1.jpg" alt="" /><img src="/DOCUME~1/Sabrina/LOCALS~1/Temp/moz-screenshot-2.jpg" alt="" /></p>
<p><img src="/Documents%20and%20Settings/Sabrina/Desktop/GIT/untitled.jpg" alt="" /><img src="/Documents%20and%20Settings/Sabrina/Desktop/GIT/untitled.jpg" alt="" /></p>
<p><img src="/Documents%20and%20Settings/Sabrina/Desktop/GIT/untitled.jpg" alt="" /></p>
<p><!--[if !mso]&#62;--><br />
<span style="font-size:11pt;line-height:115%;font-family:&#34;"><!--[if gte vml 1]&#62;                    &#60;![endif]--><!--[if !vml]--><!--[endif]--></span></p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Git Version Control System usage techniques]]></title>
<link>http://cieslakd.wordpress.com/?p=5</link>
<pubDate>Sat, 04 Oct 2008 09:15:49 +0000</pubDate>
<dc:creator>cieslakd</dc:creator>
<guid>http://cieslakd.pt-br.wordpress.com/2008/10/04/git-version-control-system-usage-techniques/</guid>
<description><![CDATA[We (Aplikacja.info) are a small Polish software company that write mostly in Python language and use]]></description>
<content:encoded><![CDATA[<p>We (<a href="http://aplikacja.info" target="_self">Aplikacja.info</a>) are a small Polish software company that write mostly in Python language and use Linux for development.<strong> GIT</strong> is an advanced version control system that was created by Linux Torvalds for maintain Linux kernel source tree. I'll show how git can be connected in unix shell environment with <strong>make</strong> tool.</p>
<p><strong>Why</strong> GIT have been chosen to support our version control needs?</p>
<ul>
<li>Failure in development server will not block our work</li>
<li>Access to history is very fast (it's stored on every working copy)</li>
<li>I used to work during flight, GIT supports all VCS operations off-line (commit, diff, etc.)</li>
</ul>
<p>The hard thing about GIT is that it may <a href="http://blogs.gnome.org/newren/2007/12/08/limbo-why-users-are-more-error-prone-with-git-than-other-vcses/">confuse beginners</a>. If you are one, remember:</p>
<ul>
<li>Always use <strong>git diff HEAD</strong> instead of <em>git diff</em></li>
<li>Always using <strong>git commit -a</strong> instead of <em>git commit</em></li>
</ul>
<p>Some of this gotchas have been addressed by some GIT <a href="http://git.or.cz/cogito/">interfaces</a>, but they are deprecated now.</p>
<p>In order to ease GIT (and earlier, CVS) usage we introduced additional <strong>Makefile</strong> targets that handle typical source control tasks.</p>
<h2><strong>Examining working copy.</strong></h2>
<p><strong>make st</strong> shows current working copy state with all local branches and current selected branch:</p>
<pre>    st:
        git branch
        git status -a &#124; cat</pre>
<p>(cat simply remove pager call). <strong>make di</strong> shows differences between last commited version and working copy:</p>
<pre>    di:
        git diff HEAD</pre>
<p>Locally stored history (few last commits) can be inspected by <strong>make ch</strong>:</p>
<pre>    ch:
        git log --pretty=oneline -15 &#124; cat</pre>
<p>We are using topic branches strategy to develop software, so switching brach (<strong>make sb</strong>) is a very common operation:</p>
<pre>    sb:
        @read -p "name of existing branch to switch to [a-z_0-9]+: "\
            branch_name;\
        git checkout $$branch_name;</pre>
<h2>Local commits</h2>
<p>If we have some changes uncommitted in working copy we can commit them now:</p>
<pre>    commit: di st
        git commit -a</pre>
<p>Above command shows current changes to be committed (di) and state of a repository (st) then allows to enter comment.</p>
<h2>Going remote</h2>
<p>Lets synchronize our working copy with central repo (without locally unmodified changes): <strong>make sync</strong>:</p>
<pre>    sync:
        -git pull $(REPO) +`git branch &#124; awk '/^\*/ {print $$2}'`
        git push $(REPO) `git branch &#124; awk '/^\*/ {print $$2}'`</pre>
<p>It downloads curent branch from central serwer (this operation can fail when no branch exists yet, so we ignore errors here by "-" character) and pushes unsynced commits made.</p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Annoyme]]></title>
<link>http://myminutes.wordpress.com/?p=41</link>
<pubDate>Fri, 03 Oct 2008 15:19:34 +0000</pubDate>
<dc:creator>dedeibel</dc:creator>
<guid>http://myminutes.pt-br.wordpress.com/2008/10/03/annoyme/</guid>
<description><![CDATA[Viele Projekte haben wohl eine Geschichte die dahinter steckt. So auch meine aktuelle kleine Bastele]]></description>
<content:encoded><![CDATA[<p>Viele Projekte haben wohl eine Geschichte die dahinter steckt. So auch meine aktuelle kleine Bastelei.</p>
<p>Ich war auf der Arbeit wie immer fleißig am Programmieren und irgendwie ist das Thema aufgekommen, dass ich doch so laut Tippen würde. Ich glaube man könnte mir tatsächlich eine alte mechanische Schreibmaschine unter die Finger legen und würde einfach weiter klimpern.</p>
<p>Daraufhin habe ich jedenfalls entgegnet, dass die Kollegen lieber froh sein sollten, dass ich keine Schreibmaschinensounds, wie im standard ICQ Client, an hätte.</p>
<p>Aus Spass suchte ich nach einem Client unter X der so etwas kann und habe leider nichts gefunden. Ich konnte es kaum verstehen, wo dieses Feature doch derart essenziell ist.</p>
<p>Wie dem auch sei bin ich immer froh wenn ich etwas finde dass es noch nicht gibt - wie oft ist es vorgekommen das ich der Meinung war eine Tolle Idee zu haben und irgendwann feststellen musste, dass es das (leider) schon längst gab. (So wie Instant Messaging über IRC <a href="http://www.bitlbee.org/">http://www.bitlbee.org/)</a></p>
<p>Somit habe ich mich nun dran gemacht einen Schreibmaschinensound-Effekt Client für X zu schreiben. Passender weise heißt dieser <em>Annoyme</em>.</p>
<p>Es hat sich herausgestellt, dass das globale empfangen der Tastatur Event nicht ganz so einfach ist wie erwartet aber dank einem funktionierenden <a href="http://freedesktop.org/wiki/Software/XEvIE">XEvIE</a> nun doch möglich ist.</p>
<p>Ich habe mir für das Projekt in C++ einen Account bei <a href="http://github.com/">github</a> erstellt und werde es darüber pflegen. Ich sehe es als Gelegenheit etwas mehr Erfahrung mit git zu sammeln. Bisher macht es einen relativ benutzerfreundlichen Eindruck.</p>
<p><a href="http://github.com/dedeibel/annoyme/tree/master">http://github.com/dedeibel/annoyme/tree/master</a></p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[GitHub and public key]]></title>
<link>http://windhood.wordpress.com/?p=41</link>
<pubDate>Thu, 02 Oct 2008 23:56:17 +0000</pubDate>
<dc:creator>windhood</dc:creator>
<guid>http://windhood.pt-br.wordpress.com/2008/10/02/github-and-public-key/</guid>
<description><![CDATA[When run the shell script according to http://sites.google.com/a/insoshi.com/insoshi-guides/Git-Guid]]></description>
<content:encoded><![CDATA[<p>When run the shell script according to http://sites.google.com/a/insoshi.com/insoshi-guides/Git-Guides/quick-git-setup,</p>
<pre>sh configure_insoshi_local.sh &#60;GitHub account name&#62;

I got the following error:
<code>Permission denied (publickey).
fatal: The remote end hung up unexpectedly
error: failed to push to 'git@github.com:windhood/stage.git'</code>

To solve this error, you need do as following:

<code>$ cd ~/.ssh
$ ssh-add id_rsa
id_rsa is the public key name file you used for your github</code></pre>
]]></content:encoded>
</item>
<item>
<title><![CDATA[I'm gonna git you sucka!]]></title>
<link>http://flashaddict.wordpress.com/?p=391</link>
<pubDate>Thu, 02 Oct 2008 16:57:13 +0000</pubDate>
<dc:creator>flashaddict</dc:creator>
<guid>http://flashaddict.pt-br.wordpress.com/2008/10/02/im-gonna-git-you-sucka/</guid>
<description><![CDATA[Some of the funniest scenes  and the trailer from a classic spoof of the 70&#8217;s Blacksploitatio]]></description>
<content:encoded><![CDATA[<p>Some of the funniest scenes  and the trailer from a classic spoof of the 70's Blacksploitation film genre...props to CC for reminding me of this hilarious movie from the 80's!</p>
<p><span style='text-align:center; display: block;'><object width='425' height='350'><param name='movie' value='http://www.youtube.com/v/G7M8q4ABq98'></param><param name='wmode' value='transparent'></param><embed src='http://www.youtube.com/v/G7M8q4ABq98&rel=0' type='application/x-shockwave-flash' wmode='transparent' width='425' height='350'></embed></object></span></p>
<p>&#124;-------Twelve Inches------&#124;</p>
<p><span style='text-align:center; display: block;'><object width='425' height='350'><param name='movie' value='http://www.youtube.com/v/KNQRqAoT-2c'></param><param name='wmode' value='transparent'></param><embed src='http://www.youtube.com/v/KNQRqAoT-2c&rel=0' type='application/x-shockwave-flash' wmode='transparent' width='425' height='350'></embed></object></span></p>
<p>How much for one rib?</p>
<p><span style='text-align:center; display: block;'><object width='425' height='350'><param name='movie' value='http://www.youtube.com/v/OnME92JU9zc'></param><param name='wmode' value='transparent'></param><embed src='http://www.youtube.com/v/OnME92JU9zc&rel=0' type='application/x-shockwave-flash' wmode='transparent' width='425' height='350'></embed></object></span></p>
<p>Pimp of the Year</p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Use git tags]]></title>
<link>http://andreasjacobsen.wordpress.com/?p=10</link>
<pubDate>Wed, 01 Oct 2008 14:15:46 +0000</pubDate>
<dc:creator>Andreas</dc:creator>
<guid>http://andreasjacobsen.com/2008/10/01/use-git-tags/</guid>
<description><![CDATA[I&#8217;m quite fond of Git. The home of Git projects on the web is GitHub. A lot of good projects, ]]></description>
<content:encoded><![CDATA[<p>I'm quite fond of <a href="http://git.or.cz/">Git</a>. <em>The</em> home of Git projects on the web is <a href="http://github.com">GitHub</a>. A lot of good projects, mostly <a href="http://github.com/languages">Ruby and JavaScript</a> related, but also others. It's a popular home for <a href="http://github.com/search?q=dotfile">dotfiles</a> as well.</p>
<p>Unfortunately, the practice of tagging releases isn't as common as it should be. Tags are pretty much just aliases for commits, though they can be annotated and even GPG signed (so, for example, no one can fake a Linux kernel tag by Linus). Part of that may be that Git doesn't push tags by default.</p>
<p>But pushing a tag is easy, just add the --tags parameter to the push and it'll push all your tags.</p>
<p><code>git push --tags origin master</code></p>
<p>Or, if you only want to push a single tag, you can push the tag directly.</p>
<p><code>git push origin mynewtag</code></p>
<p>Unlike Subversion tags, these won't create whole new copies of the repository that can accidentally be committed to.</p>
<p>Tags are very useful when dealing with different releases of a project and you find yourself wondering what code was like in a previous version or a version past what you're currently using. Being able to browse the source directly on a site like GitHub is very valuable, but having to look up the what commit has a comment like "bumping version" is annoying and time consuming. Not to mention that it's more difficult to trust any old comment. </p>
<p>So please tag your releases. It doesn't take a lot of effort and makes life easier for people using your project.</p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[red, green, refactor ... commit]]></title>
<link>http://silkandspinach.wordpress.com/?p=851</link>
<pubDate>Mon, 29 Sep 2008 20:08:38 +0000</pubDate>
<dc:creator>Kevin Rutherford</dc:creator>
<guid>http://silkandspinach.net/2008/09/29/red-green-refactor-commit/</guid>
<description><![CDATA[As time passes I find myself getting more and more nervous about the amount of time between passing ]]></description>
<content:encoded><![CDATA[<p>As time passes I find myself getting more and more nervous about the amount of time between passing tests, and between commits to the source code repository.  So when Neil asked me today where I put the "commit" step in my TDD practice, I said:</p>
<pre>
red
green
   commit
refactor
   commit
</pre>
<p>That extra "commit" at the green bar captures the safe state, in case I get distracted by the kids or forget to take my medication.  It also shares that working code with the rest of the team, which in turn makes sure I get feedback on whether it builds.  And that also makes sure those tests get run more frequently and outside of my environment sooner.</p>
<p>Recently I've been learning to use Git (which I like a lot, although some of the differences from Subversion stil baffle me a little).  Anyroadup, with Git I can get even more safety from the process:</p>
<pre>
red
   commit
green
   commit
   push
refactor
   commit
   push
</pre>
<p>The extra "commit" at the red bar is local to my repository.  It means I can "stop on a red bar", as used to be recommended in the early days of TDD, and yet still have all my code checked in.</p>
<p>I wonder whether I'm becoming more paranoid as Old Age now has me in its grip...</p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Git: scripts no tan inutiles parte 1]]></title>
<link>http://juanfgs.wordpress.com/?p=302</link>
<pubDate>Mon, 29 Sep 2008 14:21:16 +0000</pubDate>
<dc:creator>juanfgs</dc:creator>
<guid>http://juanfgs.pt-br.wordpress.com/2008/09/29/git-scripts-no-tan-inutiles-parte-1/</guid>
<description><![CDATA[He hecho varios pequeños scripts para el usuario de git perezoso, por ejemplo git-solve (abre los a]]></description>
<content:encoded><![CDATA[<p>He hecho varios pequeños scripts para el usuario de git perezoso, por ejemplo git-solve (abre los archivos con conflictos luego de un merge en tu $EDITOR favorito):</p>
<blockquote><p>#!/bin/sh</p>
<p>$EDITOR `git status&#124;grep unmerged&#124;cut -d ':' -f2`</p></blockquote>
]]></content:encoded>
</item>
<item>
<title><![CDATA[git merge after git cherry-pick: avoiding duplicate commits]]></title>
<link>http://davitenio.wordpress.com/?p=46</link>
<pubDate>Sat, 27 Sep 2008 14:18:23 +0000</pubDate>
<dc:creator>davitenio</dc:creator>
<guid>http://davitenio.pt-br.wordpress.com/2008/09/27/git-merge-after-git-cherry-pick-avoiding-duplicate-commits/</guid>
<description><![CDATA[Imagine we have the master branch and a branch b:

  o---X   &lt;-- master
   \
    b1---b2---b3---b]]></description>
<content:encoded><![CDATA[<p>Imagine we have the <em>master</em> branch and a branch <em>b</em>:</p>
<pre>
  o---X   &#60;-- master
   \
    b1---b2---b3---b4   &#60;-- b
</pre>
<p>Now we urgently need the commits <strong>b1</strong> and <strong>b3</strong> in <em>master</em>, but not the remaining commits in <em>b</em>. So what we do is checkout the <em>master</em> branch and cherry-pick commits <strong>b1</strong> and <strong>b3</strong>:</p>
<p>$ git checkout master<br />
$ git cherry-pick "b1's SHA"<br />
$ git cherry-pick "b3's SHA"</p>
<p>The result would be:</p>
<pre>
  o---X---b1'---b3'   &#60;-- master
   \
    b1---b2---b3---b4   &#60;-- b
</pre>
<p>Let's say we do another commit on master and we get:</p>
<pre>
  o---X---b1'---b3'---Y   &#60;-- master
   \
    b1---b2---b3---b4   &#60;-- b
</pre>
<p>If we would now merge branch b into master:</p>
<p>$ git merge b</p>
<p>We would get the following:</p>
<pre>
  o---X---b1'---b3'---Y--- M  &#60;-- master
   \                     /
     b1----b2----b3----b4   &#60;-- b
</pre>
<p>That means the changes introduced by b1 and b3 would appear twice in the history. To avoid that we can rebase instead of merge:</p>
<p>$ git rebase master b</p>
<p>Which would yield:</p>
<pre>
  o---X---b1'---b3'---Y   &#60;-- master
                       \
                        b2---b4   &#60;-- b
</pre>
<p>Finally:</p>
<p>$ git checkout master<br />
$ git merge b</p>
<p>gives us:</p>
<pre>
  o---X---b1'---b3'---Y---b2---b4   &#60;-- master, b
</pre>
<p>Reference: <a href="http://kerneltrap.org/mailarchive/git/2008/7/23/2648694">http://kerneltrap.org/mailarchive/git/2008/7/23/2648694</a></p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[A blast from the past!]]></title>
<link>http://nashvegaslawyer.wordpress.com/?p=50</link>
<pubDate>Fri, 26 Sep 2008 15:05:47 +0000</pubDate>
<dc:creator>chugan</dc:creator>
<guid>http://nashvegaslawyer.pt-br.wordpress.com/2008/09/26/a-blast-from-the-past/</guid>
<description><![CDATA[I have always admired Robben Ford and had the opportunity to learn from him when I attended Guitar I]]></description>
<content:encoded><![CDATA[<p>I have always admired Robben Ford and had the opportunity to learn from him when I attended Guitar Institute of Technology in the 80's.</p>
<p>Here's Robben with the Yellowjackets in 1979.</p>
<p><span style='text-align:center; display: block;'><object width='425' height='350'><param name='movie' value='http://www.youtube.com/v/TGVua8smJR4'></param><param name='wmode' value='transparent'></param><embed src='http://www.youtube.com/v/TGVua8smJR4&rel=0' type='application/x-shockwave-flash' wmode='transparent' width='425' height='350'></embed></object></span></p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Jadi Anda ingin melakukan perintah diff di Ruby?]]></title>
<link>http://ariekusumaatmaja.wordpress.com/?p=378</link>
<pubDate>Wed, 24 Sep 2008 07:18:42 +0000</pubDate>
<dc:creator>Arie Kusuma Atmaja</dc:creator>
<guid>http://ariekusumaatmaja.pt-br.wordpress.com/2008/09/24/jadi-anda-ingin-melakukan-perintah-diff-di-ruby/</guid>
<description><![CDATA[Fitur revision hari gini udah bukan jamannya lagi bilang sulit kalo cuma main di cvs, svn, git, bzr,]]></description>
<content:encoded><![CDATA[<p>Fitur revision hari gini udah bukan jamannya lagi bilang sulit kalo cuma main di <a href="http://en.wikipedia.org/wiki/Concurrent_Versions_System">cvs</a>, <a href="http://en.wikipedia.org/wiki/Subversion_(software)">svn</a>, <a href="http://en.wikipedia.org/wiki/Git_(software)">git</a>, <a href="http://en.wikipedia.org/wiki/Bazaar_(software)">bzr</a>, <a href="http://en.wikipedia.org/wiki/Mercurial_(software)">mercurial</a>, <a href="http://en.wikipedia.org/wiki/Svk">svk</a>, <a href="http://en.wikipedia.org/wiki/Darcs">darcs</a>, dst tapi udah biasa dipake untuk yang di web entah itu dengan solusi pintar seperti rcs atau cara konvensional lewat database biasa sahaja.</p>
<p>penggunaan command diff yang biasa kita dapatkan dari <a href="http://en.wikipedia.org/wiki/Unix">*nix</a>/<a href="http://en.wikipedia.org/wiki/Linux">linux</a> command ini bisa juga kita dapatkan dengan <a href="http://www.rubyinside.com">Ruby</a>, mungkin bagi yang belum tahu sempat terfikir untuk memakai javascript anu (hah? javascript) atau bahkan akses ke system ataupun backtick -_- </p>
<p>Berikut link link ke resource tsb, selamat menikmati!</p>
<p><a href="http://tfletcher.com/dev/rails-plugins">Situsnya</a>, <a href="http://tfletcher.com/dev/riff.zip">Sedot source codenya dalam format kompresan zip</a>, hm.. udah, biasanya dari sana kalo dilirik mustinya kalo orang Ruby udah jelas, ndul.</p>
<p>Tapi berhubung ada yang lagi manja dan pingin dimanja trus lagi bernafsu manja (anying brengsek), nih tambahan link linknya.</p>
<p><a href="http://pullmonkey.com/2007/5/2/riff-activerecord-diff-plugin">Riff Active Record diff plugin di Pull Monkey <em>huh dasar monyet!</em></a>, <a href="http://wiki.rubyonrails.org/rails/pages/Riff+Plugin">keterangan soal riff plugin di wikinya rails <em>ah ternyata lagi lagi ke wiki rails juga ya</em>, <a href="http://www.juixe.com/techknow/index.php/2006/07/05/riff-rails-plugin/">trus sama ini postingan di blognya si juixe</a></p>
<p>Udah, mo mbalik semedi lagi.</p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Rapizm Çağla - Tanımazdan Gel]]></title>
<link>http://rapsitem1.wordpress.com/?p=176</link>
<pubDate>Wed, 24 Sep 2008 01:35:00 +0000</pubDate>
<dc:creator>rapsitem1</dc:creator>
<guid>http://rapsitem1.pt-br.wordpress.com/2008/09/24/rapizm-cagla-tanimazdan-gel/</guid>
<description><![CDATA[Rapizm Çağla - Tanımazdan Gel
Ako feat. Rapizm Çagla - Ask-i ilan
Corrupt &amp; RapizmCagla - Hi]]></description>
<content:encoded><![CDATA[<p>Rapizm Çağla - Tanımazdan Gel</p>
<p>Ako feat. Rapizm Çagla - Ask-i ilan<br />
Corrupt &#38; RapizmCagla - Hiciv Olsun<br />
Rapizm Çağla feat Fieber,Hayki,Kaplan,Garez,Aycha- 6 ÇEKER<br />
Rapizm Çağla feat Medusa - Duygu Sallarım<br />
Rapizm Çağla feat Medusa - Git<br />
Rapizm Çağla feat Medusa - Kız Kıza<br />
RapizmCagla - Ala Turka<br />
RapizmCagla - Sirlari Anla<br />
RapizmCagla - Sonunu Yazdim<br />
RapizmCagla - U‡uruma Dogru<br />
RapizmCagla feat Enkaz - Kasarli Baby<br />
RapizmCagla feat Izah - Melankoli<br />
RapizmCagla feat Medusa - Marifetini Goster</p>
<p><a target="_blank" href="http://www.rapsitem.net">TIKLA İNDİR </a></p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Medusa - Antika Bedenler]]></title>
<link>http://rapsitem1.wordpress.com/?p=106</link>
<pubDate>Wed, 24 Sep 2008 01:11:05 +0000</pubDate>
<dc:creator>rapsitem1</dc:creator>
<guid>http://rapsitem1.pt-br.wordpress.com/2008/09/24/medusa-antika-bedenler/</guid>
<description><![CDATA[Medusa - Antika Bedenler
01. Medusa - Intro
02. Medusa - Medusa&#8217;nın Ruhuna
03. Medusa ft. Sam]]></description>
<content:encoded><![CDATA[<p>Medusa - Antika Bedenler</p>
<p>01. Medusa - Intro<br />
02. Medusa - Medusa'nın Ruhuna<br />
03. Medusa ft. Samuray - Umutlarım Tükendi<br />
04. Medusa - Çöl<br />
05. Medusa ft SiRmC &#38; EmzE - Herşeyin Sebebi Var<br />
06. Medusa - Medusa<br />
07. Medusa - Saklanırım<br />
08. Medusa - Şeytan Kulağına<br />
09. Medusa - Havadis<br />
10. Medusa - Git<br />
11. Medusa - Antika Bedenler</p>
<p><a target="_blank" href="http://www.rapsitem.net">TIKLA İNDİR </a></p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[İHTİLAL-Kuralda Biziz Yasada]]></title>
<link>http://rapsitem1.wordpress.com/?p=85</link>
<pubDate>Wed, 24 Sep 2008 00:56:45 +0000</pubDate>
<dc:creator>rapsitem1</dc:creator>
<guid>http://rapsitem1.pt-br.wordpress.com/2008/09/24/ihtilal-kuralda-biziz-yasada/</guid>
<description><![CDATA[İHTİLAL-Kuralda Biziz Yasada
Hayki&amp;Funye-Uyuyorum Bi Dakka!!!(ihtilal record&#8217;s)
ihtilal ]]></description>
<content:encoded><![CDATA[<p>İHTİLAL-Kuralda Biziz Yasada</p>
<p>Hayki&#38;Funye-Uyuyorum Bi Dakka!!!(ihtilal record's)<br />
ihtilal ft.aycha-cellat oglu cellat<br />
ihtilal ft.baskan-style wars<br />
ihtilal ft.darp&#38;singaf&#38;fieber-mc merasimi<br />
ihtilal ft.itaat&#38;radyasyon&#38;rasit&#38;aycha&#38;surveyan-git isine<br />
İhtilal Ft.medusa&#38;rapizm cagla-ghetto tayfalar<br />
ihtilal ft.Saladin-Ter Döker Her Böcek<br />
ihtilal ft.singaf&#38;logic&#38;erdem&#38;itaat-alın yolunuzu<br />
ihtilal(garez&#38;hayki)-yak kendini<br />
ihtilal-cıkıs<br />
ihtilal-giriş(yas)<br />
ihtilal-HEMOFİLİ-2004<br />
ihtilal-kuralda biziz yasada<br />
ihtilal-saygı duy<br />
Kaplan feat.Sürveyan - Canını Yakarım (Hardcore Version)</p>
<p><a target="_blank" href="http://www.rapsitem.net">TIKLA İNDİR </a></p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Introducing Ronin, a hacking environment for the rest of us]]></title>
<link>http://houseofpostmodern.wordpress.com/?p=36</link>
<pubDate>Wed, 24 Sep 2008 00:03:23 +0000</pubDate>
<dc:creator>postmodern3</dc:creator>
<guid>http://houseofpostmodern.pt-br.wordpress.com/2008/09/24/introducing-ronin-009/</guid>
<description><![CDATA[Ronin has been my main quasi-secret (I only told people who asked what I was hacking on in GVim) pro]]></description>
<content:encoded><![CDATA[<p><a href="http://ronin.rubyforge.org/">Ronin</a> has been my main quasi-secret (I only told people who asked what I was hacking on in GVim) project for some time now. It has also been driving most of my side projects, such as <a href="http://gscraper.rubyforge.org/">GScraper</a>, <a href="http://reverserequire.rubyforge.org/">reverse-require</a> and <a href="http://repertoire.rubyforge.org/">R'epertoire</a>. The code-base has finally settled down now, allowing me to release version <a href="http://rubyforge.org/frs/?group_id=3798&#38;release_id=25020">0.0.9</a> of <a href="http://ronin.rubyforge.org/">Ronin</a>. This is an initial beta-release, so not all of the desired features are present, although I'm always <a href="http://rubyforge.org/forum/?group_id=3798">looking</a> for <a href="http://rubyforge.org/tracker/?atid=14633&#38;group_id=3798&#38;func=browse">user-feedback</a>.</p>
<p><a href="http://ronin.rubyforge.org/">Ronin</a> is a platform for information security and data-exploration tasks. Ronin harnesses the elegance of Ruby (one-liner convenience methods, sparse <a href="http://en.wikipedia.org/wiki/Monkey_patch">monkey-patching</a>, <a href="http://en.wikipedia.org/wiki/Meta_programming">meta-programming</a>, <a href="http://pragdave.blogs.pragprog.com/pragdave/2008/03/the-language-in.html">Domain Specific Languages</a> (DSL) and <a href="http://en.wikipedia.org/wiki/Duck_typing">duck-typing</a>) to provide the user with a robust API, an extendable command-line utility and a customized <a href="http://en.wikipedia.org/wiki/IRB">IRB</a> console.</p>
<p><a href="http://ronin.rubyforge.org/">Ronin</a> is considered a platform and not a framework, since it has the ability to install Overlays of code (think extensions) and data (think exploit/shellcode repositories) from any <a href="http://subversion.tigris.org/">SubVersion</a> (SVN), <a href="http://git.or.cz/">Git</a>, <a href="http://www.nongnu.org/cvs/">CVS</a> or <a href="http://samba.anu.edu.au/rsync/">Rsync</a> repositories, which are then integrated into Ronin's environment. The ability to install 3rd party code or data from any common source-code repository using just a URI is what makes Ronin decentralized.</p>
<p><a href="http://ronin.rubyforge.org/">Ronin</a> is not bloated either, most of it's functionality is divided between various libraries which can be selectively installed by the user. These libraries allow the user to choose what functionality they need from Ronin. Ronin currently provides the following libraries:</p>
<ul>
<li><a href="http://ronin.rubyforge.org/docs/ronin-sql/">Ronin SQL</a> - Provides <a href="http://unixwiz.net/techtips/sql-injection.html">SQL Injection</a> tests, exploitation methods and a DSL for generating <a href="http://ha.ckers.org/sqlinjection/">complex</a> SQL Injection statements.</li>
<li><a href="http://ronin.rubyforge.org/docs/ronin-php/">Ronin PHP</a> - Provides PHP Local File Inclusion (LFI) and <a href="http://en.wikipedia.org/wiki/Remote_File_Inclusion">Remote File Inclusion</a> (RFI) tests, fingerprinting, exploitation methods and a custom PHP Remote Procedure Call (RPC) server which can injected via RFI vulnerabilities.</li>
<li><a href="http://ronin.rubyforge.org/docs/ronin-dorks/">Ronin Dorks</a> - Provides a simply API for performing common or even custom <a href="http://www.encription.co.uk/downloads/The_Google_Hackers_Guide_v1.0.pdf">Google Dorks</a>.</li>
<li><a href="http://ronin.rubyforge.org/docs/ronin-exploits/">Ronin Exploits</a> - Provides an API for defining <a href="http://milw0rm.com/">Exploits or Payloads</a> which can also be distributed over the previously mentioned Overlays and cached by Ronin for later use.</li>
</ul>
<p><a href="http://ronin.rubyforge.org/">Ronin</a> is packaged as a RubyGem and can be downloaded <a href="http://rubyforge.org/frs/?group_id=3798&#38;release_id=25020">here</a>. To install Ronin using RubyGems, simply run the following command:</p>
<pre>$ sudo gem install ronin</pre>
<p>Documentation for <a href="http://ronin.rubyforge.org/">Ronin</a> and it's libraries can be found <a href="http://ronin.rubyforge.org/docs.html">here</a>. If you have further questions there's also a <a href="http://ronin.rubyforge.org/faq.html">FAQ</a> for Ronin.</p>
<p><strong>Update 2:</strong> I have recently published a <a href="http://ronin.rubyforge.org/howtos/everyday_ronin.html">HOWTO</a> covering Ronin's convenience methods and how to perform everyday tasks in the Ronin Console (such as owning web-servers).</p>
<p><strong>Update 1:</strong> An astute reader of this blog pointed out that R'epertoire 0.1.2, which is required by Ronin, was not yet released as a RubyGem on rubyforge.org. This issue has been corrected and R'epertoire 0.1.2 is now available for <a href="http://rubyforge.org/frs/?group_id=5272&#38;release_id=26451">download</a>.</p>
<p>Also expect a release of the <a href="http://ronin.rubyforge.org/docs/ronin-exploits/">Ronin Exploits</a> soon (I'm in the process of adding the beginnings of <a href="http://seattle.toorcon.org/2007/talks.php?id=11">Vulnerability Taxonomy</a> to the <a href="http://ronin.rubyforge.org/docs/ronin-exploits/classes/Ronin/Exploits/Exploit.html">Exploit</a> base-class).</p>
]]></content:encoded>
</item>
<item>
<title><![CDATA[Problems with git bare repos and hooks?]]></title>
<link>http://bretm.wordpress.com/?p=28</link>
<pubDate>Tue, 23 Sep 2008 10:24:38 +0000</pubDate>
<dc:creator>bretm</dc:creator>
<guid>http://bretm.pt-br.wordpress.com/2008/09/23/problems-with-git-bare-repos-and-hooks/</guid>
<description><![CDATA[Had an interesting issue crop up yesterday&#8230; supposedly, the reason a post-receive hook wasn]]></description>
<content:encoded><![CDATA[<p>Had an interesting issue crop up yesterday... supposedly, the reason a post-receive hook wasn't firing was because the repo was set to "bare=true".  I've googled for "bare repo" plus "hook", and can't find anything that would suggest hooks function any differently on bare repos vs normal ones.</p>
<p>Can anyone out there point me in the right direction?</p>
]]></content:encoded>
</item>

</channel>
</rss>
