Categories
Tags
- aiglx
- ajax
- Apple Mail
- ati
- blogging
- C
- compiz
- cy7c68013a
- cypress
- design
- ebuild
- emerge
- extension
- finance
- fx2
- fx2lib
- gentoo
- git
- gmail
- image upload
- internet
- javascript
- linux
- money
- OS X
- performance
- plugins
- python
- rich text editor
- rte
- scalability
- scm
- source code
- source control
- sysadmin
- turbogears
- ui
- upgrade
- virtual python
- Web
- wordpress
- wp-cache
- xorg
- yui
- My Tweets
Tag Archives: 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. … Continue reading
Posted in Programming
Tagged diff, git, source code, source control
Comments Off on git diff with color words
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 … Continue reading
Posted in Programming
Tagged branch, git, rebase, rewrite
Comments Off on How to fix that mistake commit you just pushed to your git repository
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 … Continue reading
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.
Posted in Software
Tagged ajax, code, git, image upload, javascript, rich text editor, rte, yui
Comments Off on YUI Image Uploader gets a code repository
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 … Continue reading
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 … Continue reading