how to compare fetch to see changes?
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?
Signature · 2 lines
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.
Quoted 2 lines · saltzmanjoelh
How do I compare what was fetched to compare changes?
"git fetch" prints something like that:
Quoted 1 line
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
Quoted 3 lines
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