You are currently browsing the monthly archive for June 2008.

Sometimes you run commands that are a little complicated or just too long to write. Git has support for command aliases that are very easy to set up.
Read the rest of this entry »

Advertisements

Do you ever find it difficult figuring out complex merges? “Wait, was my change the part after the <<<<<<< or before the >>>>>>> ?”, “What did I do here and what did they do?”, “Oh my gawd, was this whole file modified?!?” If you find yourself asking these questions, maybe you need to use git mergetool.
Read the rest of this entry »

Wouldn’t it be great if you could find all the changes to a line in your entire history? Sort of like git blame, but only for revisions that match some string. This is where git’s pickaxe functionality comes in.
Read the rest of this entry »