Tag Archives: source control

git diff with color words

Posted on June 2, 2012 by Dennis

I had these files with very very long lines of text on each line. It was paragraphs worth of words but not word wrapped. These files were stored in a git repository. Now and then, someone would change a word. … Continue reading →

Posted in Programming | Tagged , , , | Leave a comment

Git Rebasing Tips

Posted on November 11, 2011 by Dennis

So there you are, using git to store, track and share your code with a few others. Maybe many others. You make a change, someone else makes a change, one or the other of you pulls the others changes and … Continue reading →

Posted in Software | Tagged , , , | Leave a comment

git logk

Posted on December 2, 2009 by Dennis

Do you like gitk? I find it almost invaluable in merging, branching, looking at old revisions, diffs, etc. I find it annoying that git log is hard to glean the same information. I searched a round a bit and found … Continue reading →

Posted in Programming | Tagged , , , , | Leave a comment

How to remove or edit a commit in your git repository

Posted on September 21, 2009 by Dennis

So you just committed 15 things to your git repository and now you want to push your changes. Oops, commit #2 added your password file. Or perhaps you misspelled words in the commit message. Now, being a git expert, you … Continue reading →

Posted in Programming | Tagged , , | Leave a comment

Using piped svndumpfilter commands to separate an svn repository

Posted on October 15, 2007 by Dennis

According to the documentation for svndumpfilter, you can include one subcommand when filtering a dumped repository. Suppose you have a repository that has a path “/some/path” that you’d like to separate out into its own new repository. From the documentation, … Continue reading →

Posted in System Administration | Tagged , , , , , | 6 Comments