Disqus - Latest Comments for BartTrojanowski

Re: git ready » find unmerged commits

BartTrojanowski — Thu, 16 Apr 2009 14:57:58 -0000

I find that a nice replacement for git-cherry is

git log --cherry-pick other-branch...

which tells you what patches are there and not here. Note the 3-dots, not two (see description in man git-rev-list).

BartTrojanowski — Sat, 14 Mar 2009 11:40:34 -0000

Also on the topic of stashes... gitk can help you visualize what's going on.

gitk stash
gitk 'stash@{2}'
gitk 'stash@{yesterday}'
gitk --all

Basically you can operate on the 'stash' ref as if it were any other ref. After all, 'git stash list' is the same as saying 'git reflog show stash'.

BartTrojanowski — Fri, 27 Feb 2009 12:58:20 -0000

If you're a vim user, grab http://www.vim.org/scripts/... and then you can do:

vim branch:path/file.c

or even

:e branch:path/file.c

when inside vim.

BartTrojanowski — Fri, 13 Feb 2009 19:46:55 -0000

Also related: git branch -r

BartTrojanowski — Thu, 12 Feb 2009 21:13:58 -0000

How about...

git config --global alias.up "remote update"

It doesn't merge... but that's probably better for most people.

BartTrojanowski — Sun, 01 Feb 2009 00:39:55 -0000

git log --stat is also useful.

BartTrojanowski — Sat, 24 Jan 2009 11:08:42 -0000

For those that use ZSH and not BASH you may want to look at:

BartTrojanowski — Thu, 22 Jan 2009 13:58:54 -0000

Hmm, about the diagram... why does the 'rebase' command talk to a remote? I think that's wrong.

BartTrojanowski — Tue, 20 Jan 2009 21:22:54 -0000

Don't forget

git log -S"match something in the patch"