Daniel Betz fuzzykiller
fuzzykiller
/ git-merge-associate
Last active
November 30, 2015 14:23
— forked from MattSeen/git-merge-associate
Put somewhere in your $PATH
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/bash | |
| # | |
| # Purpose: manually associate missed renames in merge conflicts | |
| # | |
| # Usage: git merge-associate <our-target> <base> <theirs> | |
| # | |
| # Example: After a failed rename detection A/a -> B/b which results | |
| # in CONFLICT (delete/modify) for A/a and corresponding "deleted by us" | |
| # messages in git status, the following invocation can be used to manually | |
| # establish the link: |
fuzzykiller
/ Greasemonkey.js
Last active
January 3, 2025 14:41
— forked from azu/Greasemonkey.js
Greasemonkey API stubs with JSDoc, for WebStorm etc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| /** | |
| * Created by azu. | |
| * Date: 10/11/28 | |
| * Updated by fuzzykiller (2015/08/28) | |
| * License: MIT License | |
| */ | |
| /** | |
| * An object that exposes various information about Greasemonkey and the running User Script. | |
| */ |