Tag Archive for 'git'

git diff with color words

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. Diff with line based output was difficult to find what actually changed. I figured there […]

How to fix that mistake commit you just pushed to your git repository

I’ve already written a time or two how you can use git rebase to change your commit history as you work. Handy handy.. I think everyone should know how to do that. Next up.. what if you pushed a commit and realize it’s not so great. First of all, everyone discourages this of course. The […]

Git Rebasing Tips

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 BAM.. you get that merge commit. It really isn’t harmful of course, but it cleans […]

YUI Image Uploader gets a code repository

I’ve created a github project for the YUI Image Uploader. You can download the scripts and example page here: http://github.com/mulicheng/yuiupload This will also facilitate user contributed changes and backend scripts.

git logk

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 that git log is quite configurable as to what it outputs. Here is a simple […]

Dual Master Git Repositories

One of the nice things about git, is the ability to work in a distributed manor. Instead of having to have a central repository for your source code, you can create a copy of your repository and do work, while sharing the changes, on any number of machines. Often, when a few developers share code, […]