Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Feb 20, 2008
  1. @jaysoffian @gitster

    branch: optionally setup branch.*.merge from upstream local branches

    jaysoffian authored gitster committed
    "git branch" and "git checkout -b" now honor --track option even when
    the upstream branch is local.  Previously --track was silently ignored
    when forking from a local branch.  Also the command did not error out
    when --track was explicitly asked for but the forked point specified
    was not an existing branch (i.e. when there is no way to set up the
    tracking configuration), but now it correctly does.
    The configuration setting branch.autosetupmerge can now be set to
    "always", which is equivalent to using --track from the command line.
    Setting branch.autosetupmerge to "true" will retain the former behavior
    of only setting up branch.*.merge for remote upstream branches.
    Includes test cases for the new functionality.
    Signed-off-by: Jay Soffian <>
    Signed-off-by: Junio C Hamano <>
Something went wrong with that request. Please try again.