Updates to noroadsleft keymap for KC60 (#5127)
* NUBS_Z: initial version Create a keycode that is normally Z, but KC_NUBS when tapped while Alt is being held. This removes the possibility of using an Alt+Z shortcut. * NUBS_Z: modification Modify NUBS_Z macro to only use alternate operation if Right Alt is being held, rather than responding to either Alt key. Also add QMK version keycode to System layer, Equals key. * Remove unneeded breaks from process_record_user * Macro refactoring - removed G_RST and G_C10R macros - updated G_BRCH macro - outputs `master` if used while Shift is held down; or my git alias for the current branch otherwise - updated G_FTCH macro - outputs `git pull upstream ` if used with Shift; `git fetch upstream ` otherwise - swapped `modifiers` variable for `get_mods()` function directly for checking modifier state - swapped keymap-level modifier mask macros for QMK-core mod mask macros (thanks vomindoraan #4337) - renamed MODS_RALT_MASK to MOD_MASK_RALT (more consistent with the above change) * Update readme files
This commit is contained in:
@@ -4,46 +4,55 @@
|
||||
|
||||
```
|
||||
[alias]
|
||||
# change branches
|
||||
# Change branches
|
||||
co = checkout
|
||||
cob = checkout -b
|
||||
|
||||
# sync master
|
||||
sync = "!f() { if [ $(git branch-name) != "master" ]; then git checkout master; fi; git pull upstream master; git push origin master; }; f"
|
||||
# Cherry Pick
|
||||
cp = cherry-pick
|
||||
|
||||
# Check out a Pull Request
|
||||
cop = "!f() { git fetch upstream pull/$1/head:pr/$1; git checkout pr/$1; }; f"
|
||||
|
||||
# Sync master branch
|
||||
sync = !git checkout master && git fetch upstream 2> /dev/null && git pull -n upstream master && git push origin master
|
||||
|
||||
# Return the abbreviated SHA-1 of the last three commits, oldest to newest
|
||||
rl = rev-list -n 3 --abbrev-commit --reverse HEAD
|
||||
|
||||
# Add remote repo (for sending PRs to other forks, or checking out someone else's developments)
|
||||
ar = "!f() { git remote add $1 https://github.com/$2/qmk_firmware.git; }; f"
|
||||
|
||||
# Return the last five commits on the branch, in a more compact format
|
||||
hist = log --pretty=format:\"%C(yellow)%h%Creset %Cgreen%ad%Creset%n %w(100,0,3)%s%d [%an]%n\" --graph --date=iso-local -n 5
|
||||
histm = log --pretty=format:\"%C(yellow)%h%Creset %w(100,0,3)%s%d [%an]\" --graph --date=iso-local -n 5
|
||||
histt = log --pretty=format:\"%C(yellow)%h%Creset %<(88,trunc)%s [%an]\" --graph --date=iso-local -n 5
|
||||
histb = log --reverse --pretty=format:\"- %<(98,trunc)%s [%an]\" --date=iso-local -n 5
|
||||
hist = log --pretty=format:\"%C(yellow)%h%Creset %Cgreen%ad%Creset %Cblue[%an%Cgreen% GK%Cblue]%C(yellow)%d%Creset%n %w(100,0,2)%s%n\" --graph --date=iso-local -n 5
|
||||
histt = log --pretty=format:\"* %C(yellow)%h%Creset %<(58,trunc)%s %Cblue%>(18,trunc)%an%Cgreen% G?%Creset @ %Cgreen%ad%Creset\" --date=iso-local -n 5
|
||||
histb = log --reverse --pretty=format:\"- %Cblue%>(20,trunc)%an %Creset%<(97,trunc)%s\" --date=iso-local -n 5
|
||||
|
||||
# Follow a file's filename history
|
||||
follow = log --follow --name-only --pretty=format:\"%C(yellow)commit %H%Creset%d\nAuthor: %an <%ae>\nDate: %ad%n%n %s%n\" --date=iso-local
|
||||
|
||||
# compact diff
|
||||
df = "diff --compact-summary"
|
||||
|
||||
# List all the files changed in a commit
|
||||
dt = "diff-tree --no-commit-id --name-only -r"
|
||||
|
||||
# Short-form status
|
||||
st = "!git status --short"
|
||||
st = "!git status --short --untracked-files=no"
|
||||
|
||||
# Returns the name of the current branch
|
||||
branch-name = "!git rev-parse --abbrev-ref HEAD"
|
||||
bn = "!git branch-name" # short-form of the above
|
||||
|
||||
# short-form of the above
|
||||
bn = "!git branch-name"
|
||||
# Compare commit counts between current branch and QMK master
|
||||
cc = "!f() { git fetch upstream; echo \"[0;32m$(git branch-name)[0m vs. [0;31mupstream/master[0m\"; git rev-list --left-right --count $(git branch-name)...upstream/master; }; f"
|
||||
|
||||
po = "push origin ($(git branch-name))"
|
||||
# Push to origin repo
|
||||
po = "push origin $(git branch-name)"
|
||||
|
||||
# List the stashes
|
||||
sl = "stash list"
|
||||
|
||||
# Show the contents of a numbered stash
|
||||
# Syntax:
|
||||
# git st-show <int>
|
||||
st-show = "!f() { git stash show stash@{$1} -p; }; f"
|
||||
|
||||
# Apply a stash, without deleting it from the list of stashes
|
||||
# Syntax:
|
||||
# git st-copy <int>
|
||||
st-copy = "!f() { git stash apply stash@{$1}; }; f"
|
||||
|
||||
# Unstage a file
|
||||
unstage = "reset HEAD"
|
||||
|
||||
@@ -53,4 +62,15 @@
|
||||
# Compare local master repo to its upstream branch. If anything is returned, local branch has diverged from upstream.
|
||||
cm = "!f() { git fetch upstream master; git diff $(git branch-name) upstream/master --compact-summary; }; f"
|
||||
cml = "!f() { git fetch upstream master; git diff $(git branch-name) upstream/master; }; f"
|
||||
|
||||
# Delete a branch from local and remote
|
||||
del-branch = "!f() { git branch -d $1; git push origin :$1; git fetch -p origin; }; f"
|
||||
|
||||
# Rebase with signatures
|
||||
rbv = rebase --exec 'git commit --amend --no-edit -n -S' -i
|
||||
|
||||
# Force push without overwriting established history
|
||||
pushf = push --force-with-lease
|
||||
|
||||
|
||||
```
|
||||
|
||||
Reference in New Issue
Block a user