From: Daniel Biran <dbiran@google.com>
To: git@vger.kernel.org
Subject: git merge algorithm question
Date: Tue, 5 Sep 2017 17:53:59 -0700 [thread overview]
Message-ID: <92605DF3-9274-45A6-88B7-6281D192203F@google.com> (raw)
In-Reply-To: 202EE2E2-1D0B-4772-85F7-7C7804905297@google.com
>> I'm trying to better understand one of the merge algorithms as I had some triumphs and tribulations with using a set of commands during a merge. tldr: can a git merge -s recursive -X patience; // result in a fast-forward merge? will --no-ff stop it
>>
>> So, the scenario is this:
>> - Merging a master branch into a feature branch that is 2+ years old
>> - We found this command was more beneficial when merging a large 20k line text file:
>> - git merge -s recursive -X patience master
>> - In a recent merge using this approach the reflog shows that the merge was performed using a fast-forward from the feature branch's head
>> - 082517-1, feature/branch) HEAD@{23}: merge feature/branch: Fast-forward
>>
>>
>> My question is, is it possible for that command to use a fast-forward like this? (or did something else go horribly wrong? possibly an atlassian git GUI tool corrupting the work):
>> - If it is possible for the command to fast-forward the merge when making the commit does --no-ff force the command to never use fast-forward in this case
>>
>> Thanks for the help,
>> Daniel
>
next parent reply other threads:[~2017-09-06 0:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <202EE2E2-1D0B-4772-85F7-7C7804905297@google.com>
2017-09-06 0:53 ` Daniel Biran [this message]
2017-09-06 1:43 ` git merge algorithm question Bryan Turner
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=92605DF3-9274-45A6-88B7-6281D192203F@google.com \
--to=dbiran@google.com \
--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).