It’s really dependent on what you’re trying to do. My rule of thumb is that if the merge “means something” I use the –no-ff option. When the merge doesn’t really mean anything and you might have used a rebase there’s no reason to use –no-ff. The thing with git is that it’s a very powerful … Read more
This is vim, it’s a common unix editor press: :wq that’s it. (w=write q=quit)
As of GitLab 11.10, if you’re using git 2.10 or newer, you can automatically create a merge request from the command line like this: git push -o merge_request.create More information can be found in the docs.
Regarding the alternatives git checkout iphone -b iphone31 git merge master and git checkout master -b iphone31 git merge iphone they will have identical ease or difficulty, it is like arguing whether a glass is half full or half empty. Version tree perception How we look at version trees are in some way just our … Read more
I’m aware this isn’t answering the original question, but for the benefit of git noobs like myself who reach this page because it’s currently the first Google result for “git change merge commit message”, I’ll mention that it is possible to: git commit –amend -m”New commit message” to change the commit message of a merge … Read more
If you have already made some commits, you can do the following git pull –rebase This will place all your local commits on top of newly pulled changes. BE VERY CAREFUL WITH THIS: this will probably overwrite all your present files with the files as they are at the head of the branch in the … Read more
Found the answer after some digging EDIT: As per Mark’s suggestion, this is the best way to do so: git config –global core.mergeoptions –no-edit
The differences These options exists for separate purposes. Your repository ends up differently. Let’s suppose that your repository is like this after you are done developing on the topic branch: –squash If you checkout master and then git merge –squash topic; git commit -m topic, you get this: –no-ff –no-commit Instead, if you do git … Read more
Try setting merge.renameLimit to something high for this merge. git tries to detect renames, but only if the number of files is below this limit, since it requires O(n^2) processing time: git config merge.renameLimit 999999 then when done: git config –unset merge.renameLimit
Looks like GitHub does not support this – and this is a TERRIBLE affair. You basically CANNOT run an atomic, linear commit strategy (the best there is) using the GitHub UI. Note that Bitbucket DOES support this, and has much more fine-grained options for setting up the PR landing/integration strategy. Namely the ‘Rebase, fast-forward’ option which … Read more