Archive

Archive for the ‘git’ Category

Better git diff

November 2, 2011 Leave a comment

git diff is very good and crisp to see quickly what changed, but if you are reviewing a big non-trivial change across many files it gets a bit tedious and irritating.

So I found this post –> http://jeetworks.org/node/90 which basically suggests using “git difftool” instead of just “git diff”. git difftool will have some default editor as the diffing agent.

Alternatively you can also set it yourself in the gitconfig to mayber soemthing like vimdiff.

Categories: git, vim Tags: , , , ,

.gitignore not working

October 4, 2011 Leave a comment

A very common problem with gitignore when you just setup is the memory it has of the files already being watched by it which you want to be ignored now on. So basically, you need to clean everything from git’s index and then add it back! Super.

Source: http://www.randallkent.com/development/gitignore-not-working

 

Taskwarrior – task

August 21, 2010 2 comments

After looking for many simple task managers around I have finally settled with Taskwarrior

It is simple, runs on the terminal, extremely lightweight as it is just a text data file which gets created. Also you can do some pretty complicated things with this. Along with simplicity of using it and having used it, it allows for a multitude of options. It has both simple and advanced features and a developers guide to create cool/useful plugins for linking it with something else you are comfortable using.

Also, I am using Git along with it to keep my task lists in sync. Also there are tons of features along with this. It’s simply elegant. I will be trying to sync some required tasks out of these with my google calendar in case I like to be buzzed. And with googlecl this is very easily possible.

Never have my todos looked so clean! Try it for yourself!

! [rejected] master -> master (non-fast forward) – Git

October 13, 2009 Leave a comment

[zubin@zubin-desktop]$ git push -v master
Pushing to git@github.com:/path/to/git/repo.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to ‘git@github.com:/path/to/git/repo.git’

As a git noob, you will see this for sure. It can easily taken care of. Recall, the reason of usage of git? yes, version control, so before trying to push, do pull, because probably tour local copy is outdated.

Solution:

[zubin@zubin-desktop]$ git pull <remote add name> master

And then do changes and push. Keep an habit of always pulling before you start coding the day’s work and then push. Some organization will help!

Categories: git Tags: , ,
%d bloggers like this: