[kwlug-disc] git-pull for individual files

[Chris Frey]

On Wed, Apr 16, 2014 at 10:16:05PM -0400, John Johnson wrote:
> The question below (re: git 'pull' of a specific file [w/o
> overwriting current]) remains at least for me, open.

Note that git-pull is just a shortcut for the commands:

	git-fetch
	git-merge

You can do a git-fetch anytime to update your copies of the remote
repositories (i.e. the stuff often under "origin").  And then you
can merge at will.

Merging is done at a commit level, not a tree level.  If you need to
merge only a certain tree or file, it would be better to split that
file's change into one commit, so you can reference it by commit.

- Chris