diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-26 06:43:51 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-29 11:24:41 +0400 |
| commit | 60fb5b2c4d9e26204f480f8a18ae1ff0051a6440 (patch) | |
| tree | a05853f1c4566d06f279267fdf783efe35f355e7 /http-fetch.c | |
| parent | bf7960eb51a26bcf52f27a60bfcf005661266b1e (diff) | |
Use git-merge in git-pull (second try).
This again makes git-pull to use git-merge, so that different merge
strategy can be specified from the command line. Without explicit
strategy parameter, it defaults to git-merge-resolve if only one
remote is pulled, and git-merge-octopus otherwise, to keep the
default behaviour of the command the same as the original.
Also this brings another usability measure: -n flag from the command
line, if given, is passed to git-merge to prevent it from running the
diffstat at the end of the merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'http-fetch.c')
0 files changed, 0 insertions, 0 deletions