git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: neuling@dakosy.de
To: git@vger.kernel.org
Subject: git pull --rebase should use fast forward merge if possible
Date: Wed, 29 Jun 2016 18:18:37 +0200	[thread overview]
Message-ID: <OF95D98CB6.47969C1C-ONC1257FE1.0058D980-C1257FE1.0059986D@dakosy.de> (raw)

Hi, 

since I have added "pull.rebase=preserve" to my global configuration I 
wonder why "git pull" also trys to rebase if a fast forward merge is 
possible. 

A fast forward merge would speed up every pull if your local branch 
contains no new commits and the remote branch is ahead. The result would 
be the same. 

Is it possible to change the behavior of "git pull 
--rebase=true|preserve|interactive" to use a fast forward merge if the 
remote branch is ahead and the local branch contains no new commits? 


Regards, 
Mattias 

             reply	other threads:[~2016-06-29 16:18 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-29 16:18 neuling [this message]
2016-06-29 16:32 ` git pull --rebase should use fast forward merge if possible Junio C Hamano
2016-06-29 17:23   ` Junio C Hamano
2016-06-29 20:40     ` Stefan Beller
2016-06-29 20:43       ` Junio C Hamano
2016-12-01 17:59         ` Re* " Junio C Hamano
2016-12-01 18:24           ` Stefan Beller
2016-12-01 18:50             ` Junio C Hamano
2016-12-01 18:51               ` Stefan Beller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=OF95D98CB6.47969C1C-ONC1257FE1.0058D980-C1257FE1.0059986D@dakosy.de \
    --to=neuling@dakosy.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).