Re: [tlug] GPL non-sense

["Stephen J. Turnbull" <stephen@example.com>]

Shawn Brown writes:
 > > "git pull" will automatically merge right?
 > > can I do "git fetch" see the changes and then git cherry-pick?
 > I'll try:
 > 
 > git fetch
 > 
 > git diff origin (to show changes)

I would use gitk for this, since it makes browsing a point-and-clicky
kind of thing.  The SHA1 is automatically selected, so you can just
middle click to yank the SHA1 into a git cherry-pick command.

 > 
 > git cherry-pick (to pull individual commits)