how to compare fetch to see changes?

saltzmanjoelh· Mar 8, 2010, 22:01 UTC · lore

How do I compare what was fetched to compare changes?

Then, how do I choose to pick some changes over others, like the mergetool does?

-- 
View this message in context: http://old.nabble.com/how-to-compare-fetch-to-see-changes--tp27828348p27828348.html
Sent from the git mailing list archive at Nabble.com.

Dmitry Potapov· Mar 9, 2010, 08:35 UTC · re: saltzmanjoelh · lore

Re: how to compare fetch to see changes?

On Mon, Mar 08, 2010 at 02:01:42PM -0800, saltzmanjoelh wrote:

> 
> How do I compare what was fetched to compare changes?

"git fetch" prints something like that:

>From git://git.kernel.org/pub/scm/git/git

   7ff0f55..636c8b2  html       -> origin/html
   b599672..97222d9  maint      -> origin/maint
   59e5778..7e15109  man        -> origin/man
   7e5eb8f..b7e7f6f  master     -> origin/master

So, if you want to see what new was fetched for master, you can run:
  $ gitk 7e5eb8f..b7e7f6f

> 
> Then, how do I choose to pick some changes over others, like the mergetool
> does?

You can cherry-pick some patches and even modify them if necessary, but it is not a good workflow. Normally, you should merge branches, then it will be clear what is merged and what is not, and Git will automatically merge only changes that were not merged before.

Dmitry