This will output the git sha of the merge commit that a given commit is
part of. This can be used to get back to the pull request a commit was
part of. Or it can be used to help revert a hole changeset rather than
only one commit.
There are two wrapper scripts for running codeclimate locally in docker.
This script is adapted from their website. There is also a script that
will output the results in vimgrep format, so they can be easily loaded
into the quickfix list.
This is a script that will popup a window with a list of windows in a
fzf promp. When selected the window will be focused. If the window is in
another session the session will also be switched and the window focused
When trying to merge-patch it will fail if the branch you are trying to merge is
already on the local machine.
This will ask if you want to remove it. The branch will be removed locally and
then pulled from the remote to ensure you are not merging any un-pushed local
changes.
When merge patching it will now detect if there is an unresolved conflict in
your current branch and exit without doing anything.
This is useful when merging multiple branches at once, if you hit a conflict
half way though it would remove the "MERGE_PATCH" file and lose where you where
in the patch
Now the script will exit and not lose the position so you can `--continue`
correctly after fixing the conflicts
Now when merging to it will rebase onto the target branch to make
merge-to work more. I was finding that it will fail and I was doing
the merge step all the time so now its built in.
This is the first commit that brings the privet dotfiles to a public
reop previously this was all one puppet module. Now this has been split
out so I can put all of the private files in a private puppet module
