Re: Patches & SendTo for regular files

2009/4/25 Ben Morrow <[email protected]>:
> Quoth Thomas Leonard <[email protected]>:
>> 2009/4/25 Bernard Jungen <[email protected]>:
>>
>> > Otherwise, how much more time-wasting is that for you to integrate
>> generated patches?
>>
>> The only problem is that if two people apply your patches then GIT
>> will see that as two separate commits, whereas if we both pull from
>> your repository then it treats it as a single commit.
>
> I thought that if the patches were generated with git-format-patch and
> applied with git-am then it was equivalent to a pull? (I thought that
> was the whole point.)

There seem to be three different ways of sending patches with GIT:

git-diff / git-apply : like "svn diff" and "patch". No log message or
author information (only changes working copy), so tedious to apply
because I have to commit them myself.

git-format-patch / git-am : A series of patches with author
information and commit messages. Gets added as a series of commits
against my HEAD, where the Author is the original author and Committer
is me. Quite easy to use, but if two people commit them they look like
separate commits in the history. The original author then has to
discard their commits and use mine instead (fairly easy to do,
though).

git-push / git-pull : The exact commit objects are shared. Author and
Committer are the original author.

Personally, I prefer the last option because it's the least work for
me, but git-format-patch works well too.


-- 
Dr Thomas Leonard		ROX desktop / Zero Install
GPG: 9242 9807 C985 3C07 44A6  8B9A AE07 8280 59A5 3CC1

------------------------------------------------------------------------------
Crystal Reports &#45; New Free Runtime and 30 Day Trial
Check out the new simplified licensign option that enables unlimited
royalty&#45;free distribution of the report engine for externally facing 
server and web deployment.
http://p.sf.net/sfu/businessobjects