Re: [Q] Mark files for later commit?

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Mar 29, 2011, 07:45 UTC
Message-ID: <4D918E2E.4000206@drmicha.warpmail.net>
In-Reply-To: <201103290938.41528.johan@herland.net>

Johan Herland venit, vidit, dixit 29.03.2011 09:38:

Show 9 quoted lines

> On Tuesday 29 March 2011, Michael J Gruber wrote:
>> Note that you can share
>> notes when you set up refspecs etc in a push/pull based workflow. (I'm
>> not sure how well we support merging/pulling notes refs yet.)
> 
> Since v1.7.4, you can use "git notes merge" for merging notes ref. It's not 
> yet integrated with "pull", though, so typically you want to fetch it to a 
> different ref name, and then manually "git notes merge" that into the 
> original notes ref.

Yes, but what I meant with "well" was: If I merge regular branches, do the notes get merged automatically? And the answer is "no", and as you explain above, "git notes merge" copes with that (and with merging notes for the same commit).

> E.g. if you want to sync "refs/notes/foo" with remote "bob", you can "git 
> fetch bob refs/notes/foo:refs/notes/bobs_foo", and then
> merge them with "git notes --ref=foo merge bobs_foo".

Longing for that refs/ layout overhaul...

Show 5 quoted lines

>> This does not work well in a patch/e-mail-based workflow.
> 
> ...although there have been mailing list discussions on getting notes added 
> to "git format-patch" output (after the "---"), and then picked up again by 
> "git am".

So, here my "not well" was even overly positive ;)

Michael