Re: [Q] Mark files for later commit?

From: Johan Herland <johan@herland.net>
Date: Mar 29, 2011, 07:38 UTC
Message-ID: <201103290938.41528.johan@herland.net>
In-Reply-To: <4D91858F.7030404@drmicha.warpmail.net>

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.

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".

> 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".

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net