diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2006-12-28 02:35:11 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-28 01:08:06 -0800 |
| commit | 6b5a795bf586aa019bbb11ffe9f2fc315ba9765e (patch) | |
| tree | 9a2ce7462d6cbade246358a6695d8e4f116121fd /git-pull.sh | |
| parent | de811948baa689382ad191c1c95e8be51a92c4fe (diff) | |
| download | git-6b5a795bf586aa019bbb11ffe9f2fc315ba9765e.tar.gz git-6b5a795bf586aa019bbb11ffe9f2fc315ba9765e.tar.xz | |
Allow git-merge to select the default strategy.
Now that git-merge knows how to use the pull.{twohead,octopus}
configuration options to select the default merge strategy there
is no reason for git-pull to do the same immediately prior to
invoking git-merge.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/git-pull.sh b/git-pull.sh index 27259464f..28d08195f 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -90,18 +90,6 @@ case "$merge_head" in echo >&2 "Cannot merge multiple branches into empty head" exit 1 fi - var=`git-repo-config --get pull.octopus` - if test -n "$var" - then - strategy_default_args="-s $var" - fi - ;; -*) - var=`git-repo-config --get pull.twohead` - if test -n "$var" - then - strategy_default_args="-s $var" - fi ;; esac @@ -112,12 +100,6 @@ then exit fi -case "$strategy_args" in -'') - strategy_args=$strategy_default_args - ;; -esac - merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit exec git-merge $no_summary $no_commit $squash $strategy_args \ "$merge_name" HEAD $merge_head |