On Tue, 10 Apr 2007, Andy Parkins wrote:
On Tuesday 2007, April 10, Linus Torvalds wrote:
(But there's nothing that says that the ".gitmodules" file couldn't
just use the same parser as the git config file, so I don't really
strongly care either way. I just think it would be nice to be able to
say
[module "kdelibs"]
dir = kdelibs
url = git://git.kde.org/kdelibs
description = "Basic KDE libraries module"
[module "base"]
alias = "kdelibs", "kdebase", "kdenetwork"
or whatever. You get the idea..)
Would it be nicer if .gitmodules were line-based to aid in merging?
this is very similar to the problem I asked about with merging config files a
couple weeks ago. the answer then was that when we get .gitattributes we should
be able to specify content specific merge programs that could deal with this
sort of thing on a per-file basis. That sounds like the answer to your concern
as well, rather then makeing things order dependant and otherwise harder to read
to make it able to be merged with the current tools (which assume line-based
order-dependant content)
David Lang
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html