2

Is is possible to enforce merges with the --no-ff flag for git repositories on Github?

I need to keep the history with the extra merge commit, but I'm not sure if the Github merge UI will do this?

Thanks, Adam

Adam
  • 5,091
  • 5
  • 32
  • 49
  • Possible duplicate of http://stackoverflow.com/questions/4083724/can-i-enforce-a-merge-only-branch-in-git – Anish Shah Mar 19 '14 at 12:33
  • 1
    @AnishShah Possibly? But this question is about Github specifically, not git in general. My config options, hooks, etc.. might be limited – Adam Mar 19 '14 at 12:42

1 Answers1

0

One way is to add an alias to your gitconfig file:

[alias]
    fmg = merge --no-ff

Then when you want to perform a merge, simply use your new alias as so:

git fmg <branch-to-merge>
tom-james-watson
  • 253
  • 3
  • 5