mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Setup branch.remote,merge for shorthand git-pull

Browse Source 
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>
This commit is contained in:
Shawn O. Pearce
2008-05-08 20:16:43 -04:00
parent 259cd0fddb
commit fe70225dc7
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
git-gui.sh
View File

@ -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