1

I'd like to following strategy of git feature branch merging: 1.local feature branch have all the detail commit history against that branch; 2.when merged into master branch, i want only 1 commit representing all the feature branch commits. How to implement that, or is that possible?

Thanks~!

kidsit
  • 287
  • 3
  • 22
  • I'm not sure I understand your requirement. The default behavior for a `git merge` is that there would be only one commit in `master` from a feature branch which is merged in. Can you clarify your question? – Tim Biegeleisen Mar 30 '16 at 04:57
  • @TimBiegeleisen, my question is: if i git merge with --no-ff, or rebase first then git merge, there will be a lot of so small granularity commits. This will polute the history on master branch. I'd like : for master branch , only feature level commit is there, not detail coding commit stay there. – kidsit Mar 30 '16 at 11:58
  • Can you give us a diagram showing the workflow between the various branches? This would also make your question more helpful to others in the future. – Tim Biegeleisen Mar 30 '16 at 12:27

0 Answers0