diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-06-18 18:54:01 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-06-18 13:16:08 -0700 |
| commit | a32975f516f2077928e29729e29612bd055c24ab (patch) | |
| tree | 1ab09616cc3f143cbccff459b0a70958c3af06c0 /builtin/merge.c | |
| parent | pull: pass git-merge's options to git-merge (diff) | |
| download | tgif-a32975f516f2077928e29729e29612bd055c24ab.tar.xz | |
pull: pass git-fetch's options to git-fetch
Since eb2a8d9 (pull: handle git-fetch's options as well, 2015-06-02),
git-pull knows about and handles git-fetch's options, passing them to
git-fetch. Re-implement this behavior.
Since 29609e6 (pull: do nothing on --dry-run, 2010-05-25) git-pull
supported the --dry-run option, exiting after git-fetch if --dry-run is
set. Re-implement this behavior.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions