On Wed, 2007-08-22 at 00:11, Junio C Hamano wrote:
> So, how about extending the syntax for [branch $current_branch]
> section of the config like this?
>
> ;; traditional -- when on "master", use '[remote "origin"] url'
> ;; and '[remote "origin"] fetch' to decide where to fetch from,
> ;; and merge their refs/heads/master to our branch.
> [branch "master"]
> remote = origin
> merge = refs/heads/master
>
> ;; new -- when on "master', and the user says to pull from "usb"
> ;; without saying which branch to merge, use '[remote "usb"] url'
> ;; and '[remote "usb"] fetch' to decide where to fetch from,
> ;; and merge their refs/heads/xprm to our branch.
> [branch "master:usb"]
> merge = refs/heads/xprm
>
> The trick in the new syntax is that you cannot have a colon in
> refname, so there is no way for existing [branch $name] section
> to crash with the new style definition.
Wasn't there was a brief alternate notion to add a "for <remote>"
clause and allowing something like this?:
[branch "master"]
merge = refs/heads/xprm for usb
merge = refs/heads/stuff for otherremote
Thanks,
jdl
-
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
