On Tue, 2013-03-26 at 20:46 +0000, Philip Oakley wrote:
> > We accept that "git blame" across the reformat will not be useful.
> > I'm going to lay down a label right before the reformat, so people can use
> > that to trace back git blame before it happened. I also will use a
> > special "code reformat" user ID for the reformat commit,
> Is this user ID programmable? (see later)
I'm not sure what you mean; isn't it possible for pretty much anyone to
declare a given author on commit? So, yes, if I understand the
> > What I really need is somehow to re-apply the changes from a branch on
> > top of the post-reformatted version, with only the actual changes
> > involved being noted as "new", not the reformatting. However rebase
> > won't cut it because I need to apply the reformatting to the changes
> > as well, to avoid massive conflicts.
> After updating your master with you script, get developer to update
> their own branch, but as a "filter-branch", with their own username.
> They now have a corrected data set that can be rebased, or a
> format-patch set generated, that summarises their changes which should
> be apply-able upstream.
This would work, I think, but then wouldn't it attribute all the changes
in their branch to the reformat user as well, in addition to the
Maybe that's OK, or at least better than having each user appear to
reformat the majority of the code on each merge (for any outstanding
> I presume you want any work-in-progress branch to be based on top of
> your newly reformatted master!
Yes, that's the goal... the question is how to get there.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/groups/opt_out.