Hi, Alan, On Jan 30, 2015, at 2:43 AM, Alan W. Irwin wrote:
> So instead of either set of commands above you should be following the > detailed recipe which is > > git checkout master > git fetch > git merge --ff-only origin/master FWIW, the pull command also accepts --ff-only. I have setup a "puff" alias for this (PUll --FF-only => PUFF): git config --global alias.puff 'pull --ff-only' Then you could do: git checkout master # if not already on master git puff origin/master I also have a "ff" alias for fast-forwarding: git config --global alias.ff 'merge --ff-only' Then you could do: git checkout master # if not already on master git fetch # examine changes git ff origin/master Enjoy, Dave ------------------------------------------------------------------------------ Dive into the World of Parallel Programming. The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
