From: Johannes Schindelin Date: Sun, 8 Jul 2007 12:41:21 +0000 (+0100) Subject: branch.autosetupmerge: allow boolean values, or "all" X-Git-Tag: v1.5.3-rc1~47 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4017761fd89060f2b57d7799f6bbda8b3568d3d4?ds=inline;hp=4017761fd89060f2b57d7799f6bbda8b3568d3d4 branch.autosetupmerge: allow boolean values, or "all" Junio noticed that switching on autosetupmerge unilaterally started cluttering the config for local branches. That is not the original intention of branch.autosetupmerge, which was meant purely for convenience when branching off of remote branches, but that semantics got lost somewhere. If you still want that "new" behavior, you can switch branch.autosetupmerge to the value "all". Otherwise, it is interpreted as a boolean, which triggers setting up defaults _only_ when branching off of a remote branch, i.e. the originally intended behavior. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano ---