| commit | fe70225dc730c5af4c491106d1e0226d1c014d1e | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 9 May 2008 00:16:43 +0000 (8 20:16 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 9 May 2008 00:20:27 +0000 (8 20:20 -0400) | ||
| tree | e93b2cb82b124f632852686bcec71a757c09d6cb | treesnapshot (tar.gz zip) |
| parent | 259cd0fddb1dea649d15e9cd5039c55dc30845b0 | commitdiff |
git-gui: Setup branch.remote,merge for shorthand git-pull
When creating new branches if branch.autosetupmerge is not set, or
is set to true or always and we have been given a remote tracking
branch as the starting point for a new branch we want to create the
necessary configuration options in .git/config for the new branch
so that a no argument git-pull on the command line pulls from the
remote repository's branch.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
When creating new branches if branch.autosetupmerge is not set, or
is set to true or always and we have been given a remote tracking
branch as the starting point for a new branch we want to create the
necessary configuration options in .git/config for the new branch
so that a no argument git-pull on the command line pulls from the
remote repository's branch.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| git-gui.sh | diffblobblamehistory | |
| lib/branch_create.tcl | diffblobblamehistory | |
| lib/checkout_op.tcl | diffblobblamehistory |