How to use “git merge --squash” while preventing regular commits using git hooks











up vote
2
down vote

favorite












I would like to prevent commits to master using a local commit hook as per the answer at https://stackoverflow.com/a/40465455/329496



That works fine as I can now merge changes on feature branches into master:



git merge feature_branch



I actually want to use squash merges so that finished features land as a single commit on master:



git merge --squash feature_branch



That doesn't actually merge it creates the squashed changes as modified files in my index. I then have to commit those index changes yet I have disabled commits to master.



Is there a way to prevent commits to master and also ensure work merged from feature branches is squashed automatically?










share|improve this question




























    up vote
    2
    down vote

    favorite












    I would like to prevent commits to master using a local commit hook as per the answer at https://stackoverflow.com/a/40465455/329496



    That works fine as I can now merge changes on feature branches into master:



    git merge feature_branch



    I actually want to use squash merges so that finished features land as a single commit on master:



    git merge --squash feature_branch



    That doesn't actually merge it creates the squashed changes as modified files in my index. I then have to commit those index changes yet I have disabled commits to master.



    Is there a way to prevent commits to master and also ensure work merged from feature branches is squashed automatically?










    share|improve this question


























      up vote
      2
      down vote

      favorite









      up vote
      2
      down vote

      favorite











      I would like to prevent commits to master using a local commit hook as per the answer at https://stackoverflow.com/a/40465455/329496



      That works fine as I can now merge changes on feature branches into master:



      git merge feature_branch



      I actually want to use squash merges so that finished features land as a single commit on master:



      git merge --squash feature_branch



      That doesn't actually merge it creates the squashed changes as modified files in my index. I then have to commit those index changes yet I have disabled commits to master.



      Is there a way to prevent commits to master and also ensure work merged from feature branches is squashed automatically?










      share|improve this question















      I would like to prevent commits to master using a local commit hook as per the answer at https://stackoverflow.com/a/40465455/329496



      That works fine as I can now merge changes on feature branches into master:



      git merge feature_branch



      I actually want to use squash merges so that finished features land as a single commit on master:



      git merge --squash feature_branch



      That doesn't actually merge it creates the squashed changes as modified files in my index. I then have to commit those index changes yet I have disabled commits to master.



      Is there a way to prevent commits to master and also ensure work merged from feature branches is squashed automatically?







      git git-merge git-squash






      share|improve this question















      share|improve this question













      share|improve this question




      share|improve this question








      edited Nov 19 at 21:46

























      asked Nov 19 at 16:59









      simbo1905

      3,0732849




      3,0732849
























          1 Answer
          1






          active

          oldest

          votes

















          up vote
          1
          down vote













          In this situation, Git doesn't know the difference between a commit on master that is of the kind you want (a merge squash) and the kind you don't want (everything else). There really isn't a way to do this with plain Git, although various hosting platforms (e.g. GitHub and GitLab) offer this as an option for pull requests.



          However, there is a workaround. You can create another branch (say, master-merge) by running git checkout -B master-merge master and perform the squash there, then fast-forward to master by using git merge --ff-only master-merge while on master. Then no actual commits are made on master, only fast forwards.






          share|improve this answer





















            Your Answer






            StackExchange.ifUsing("editor", function () {
            StackExchange.using("externalEditor", function () {
            StackExchange.using("snippets", function () {
            StackExchange.snippets.init();
            });
            });
            }, "code-snippets");

            StackExchange.ready(function() {
            var channelOptions = {
            tags: "".split(" "),
            id: "1"
            };
            initTagRenderer("".split(" "), "".split(" "), channelOptions);

            StackExchange.using("externalEditor", function() {
            // Have to fire editor after snippets, if snippets enabled
            if (StackExchange.settings.snippets.snippetsEnabled) {
            StackExchange.using("snippets", function() {
            createEditor();
            });
            }
            else {
            createEditor();
            }
            });

            function createEditor() {
            StackExchange.prepareEditor({
            heartbeatType: 'answer',
            convertImagesToLinks: true,
            noModals: true,
            showLowRepImageUploadWarning: true,
            reputationToPostImages: 10,
            bindNavPrevention: true,
            postfix: "",
            imageUploader: {
            brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
            contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
            allowUrls: true
            },
            onDemand: true,
            discardSelector: ".discard-answer"
            ,immediatelyShowMarkdownHelp:true
            });


            }
            });














             

            draft saved


            draft discarded


















            StackExchange.ready(
            function () {
            StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53379411%2fhow-to-use-git-merge-squash-while-preventing-regular-commits-using-git-hooks%23new-answer', 'question_page');
            }
            );

            Post as a guest















            Required, but never shown

























            1 Answer
            1






            active

            oldest

            votes








            1 Answer
            1






            active

            oldest

            votes









            active

            oldest

            votes






            active

            oldest

            votes








            up vote
            1
            down vote













            In this situation, Git doesn't know the difference between a commit on master that is of the kind you want (a merge squash) and the kind you don't want (everything else). There really isn't a way to do this with plain Git, although various hosting platforms (e.g. GitHub and GitLab) offer this as an option for pull requests.



            However, there is a workaround. You can create another branch (say, master-merge) by running git checkout -B master-merge master and perform the squash there, then fast-forward to master by using git merge --ff-only master-merge while on master. Then no actual commits are made on master, only fast forwards.






            share|improve this answer

























              up vote
              1
              down vote













              In this situation, Git doesn't know the difference between a commit on master that is of the kind you want (a merge squash) and the kind you don't want (everything else). There really isn't a way to do this with plain Git, although various hosting platforms (e.g. GitHub and GitLab) offer this as an option for pull requests.



              However, there is a workaround. You can create another branch (say, master-merge) by running git checkout -B master-merge master and perform the squash there, then fast-forward to master by using git merge --ff-only master-merge while on master. Then no actual commits are made on master, only fast forwards.






              share|improve this answer























                up vote
                1
                down vote










                up vote
                1
                down vote









                In this situation, Git doesn't know the difference between a commit on master that is of the kind you want (a merge squash) and the kind you don't want (everything else). There really isn't a way to do this with plain Git, although various hosting platforms (e.g. GitHub and GitLab) offer this as an option for pull requests.



                However, there is a workaround. You can create another branch (say, master-merge) by running git checkout -B master-merge master and perform the squash there, then fast-forward to master by using git merge --ff-only master-merge while on master. Then no actual commits are made on master, only fast forwards.






                share|improve this answer












                In this situation, Git doesn't know the difference between a commit on master that is of the kind you want (a merge squash) and the kind you don't want (everything else). There really isn't a way to do this with plain Git, although various hosting platforms (e.g. GitHub and GitLab) offer this as an option for pull requests.



                However, there is a workaround. You can create another branch (say, master-merge) by running git checkout -B master-merge master and perform the squash there, then fast-forward to master by using git merge --ff-only master-merge while on master. Then no actual commits are made on master, only fast forwards.







                share|improve this answer












                share|improve this answer



                share|improve this answer










                answered Nov 20 at 3:23









                brian m. carlson

                65118




                65118






























                     

                    draft saved


                    draft discarded



















































                     


                    draft saved


                    draft discarded














                    StackExchange.ready(
                    function () {
                    StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53379411%2fhow-to-use-git-merge-squash-while-preventing-regular-commits-using-git-hooks%23new-answer', 'question_page');
                    }
                    );

                    Post as a guest















                    Required, but never shown





















































                    Required, but never shown














                    Required, but never shown












                    Required, but never shown







                    Required, but never shown

































                    Required, but never shown














                    Required, but never shown












                    Required, but never shown







                    Required, but never shown







                    Popular posts from this blog

                    Wiesbaden

                    Marschland

                    Dieringhausen