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 /rsh.c | |
| 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 'rsh.c')
0 files changed, 0 insertions, 0 deletions