Merge Request and Pull request basically refers to same thing. Tools such as GitHub and Bitbucket choose the name pull request since the first manual action would be to pull the feature branch. Tools such as GitLab and Gitorious choose the name merge request since that is the final action that is requested of the … Read more
The core.hooksPath support is new in Git version 2.9, having been put in with commit 867ad08a2610526edb5723804723d371136fc643. If your Git version is not at least 2.9.0, setting a hooks-path variable will have no effect at all.
The best approach is to do subtree merging. First, remove the submodules and related configuration from your superproject; Edit your .gitmodules file to remove the submodules affected, or delete the file entirely if you intend to merge all submodules. Delete the submodule directories as well. Next, add the submodule repositories as proper remotes to your … Read more
OK, I found it. in .gitconfig: [difftool] # Be able to abort all diffs with `:cq` or `:cquit` trustExitCode = true Then inside vim just enter :cq or :cquit. This will exit vim with error codes and git has been told to rely on the error codes with trustExitCode.
The GitHub user interface will default the option to the last option selected by the user for the current project. This solves the issue of not accidentally using the wrong default, since after the merge is done correctly for the first PR, subsequent merges will have the desired default. This solution isn’t perfect. If a … Read more
For IntelliJ I use this workflow: Open the git log window or Alt + 9 Right click on commit you want to split → Interactively Rebase from Here Right click on commit you want to split → Stop to edit or Alt + E Start Rebasing Right click to the current commit in the git … Read more
You can use interactive (-i) rebase to remove a previous commit. $ git log # copy the target commit $ git rebase -i <target-commit>~1 # start rebase from the previous commit of target commit An editor will open with a list of commits, one per line. Each of these lines begins with pick. Comment out … Read more
According to Github security blog RSA keys with SHA-1 are no longer accepted. Use the following command to create new SSH key with ECDSAencryption and add it to Github. ssh-keygen -t ecdsa -b 521 -C “[email protected]” Original answer with details can be found here
Below is my method to switch and work for a remote branch of a Git repository. Have a look for all the branches first, just input following command in the terminal: git branch –all And then you will see the all the branches on local and remote. Something like this: *master remotes/origin/develop remotes/origin/master remotes/origin/web remotes/origin/app … Read more