How to turn off fast-forwarding in Git?

We are trying to use git in our project development.

We work from our private repositories, through pull-requests to main repository under another account.

  • What causes git push to fail all of a sudden with “User was holding a relation lock for too long”?
  • Deploy from bitbucket to live server
  • How do annotate a git repository?
  • SmartGit Hg “Authentication Failed”
  • How to push .txt.gz file to git
  • Why is my git submodule command not working with Bitbucket?
  • To deploy to our hosting we use ftploy.com

    We tested it, all works fine on first manual deploy, but it doesn’t work automaticly, when we merge pull-request to our master branch.

    I asked support for this problem, there is an answer:

    Currently, if you’re using Bitbucket and utilising merges you need to
    turn off fast-forwarding on your local Git install.

    Because i’m novice, i can’t understand what should i do and how my local git install connected with our main repository on another account?

  • Best way for deployments with builds, dependency managers and GIT?
  • TFS and Git - Making users be limited to push code
  • Seeing what revision goes with a tag in Git
  • OSX Yosemite - invalid characters in path
  • Ignore pulls from master, but still retain push pull for own branch
  • Edit Git alias in command line
  • One Solution collect form web for “How to turn off fast-forwarding in Git?”

    If you want to turn it off for a given branch:

    git config branch.master.mergeoptions  "--no-ff"
    

    For any branch:

    git config merge.ff false
    

    (from git config man page)

    Those commands are to be executed within the repo where you want the merge to not be fast-forwarded (see “Why does git fast-forward merges by default?”).

    Git Baby is a git and github fan, let's start git clone.