diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-05-08 20:16:43 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-05-08 20:20:27 -0400 |
| commit | fe70225dc730c5af4c491106d1e0226d1c014d1e (patch) | |
| tree | e93b2cb82b124f632852686bcec71a757c09d6cb /git-gui.sh | |
| parent | 259cd0fddb1dea649d15e9cd5039c55dc30845b0 (diff) | |
| download | git-fe70225dc730c5af4c491106d1e0226d1c014d1e.tar.gz | |
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>
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh index 7c25bb9808..9df49710e1 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -601,6 +601,7 @@ proc apply_config {} { } } +set default_config(branch.autosetupmerge) true set default_config(merge.diffstat) true set default_config(merge.summary) false set default_config(merge.verbosity) 2 |