search

wmanley / git-meld

Wrapper around git and meld for comparing git trees
GNU General Public License v2.0
207 stars 36 forks source link

git meld master... fails #4

Closed wmanley closed 12 years ago

wmanley commented 13 years ago 
git meld master...

fails with a merge-base error. Instead it should be equivalent to:

git meld $(git merge-base master HEAD)

This is consistent with the behaviour of git diff

wmanley commented 12 years ago

It should actually be equivalent to

git meld $(git merge-base master HEAD) HEAD

i.e. compare to HEAD and not the working directory. The git diff man page says:

You can omit any one of , which has the same effect as using HEAD instead.

I don't particularly like this behaviour but being consistent is probably more important

wmanley commented 12 years ago

Fixed in c59a2d147f4091238004bb2f36fe044a62ff5ccc