mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-21 09:03:23 +00:00

noroadsleft a398d2cece Keymap: Add noroadsleft keymap for KC60 (#3876 )

* Add personal KC60 keymap

* Update personal KC60 keymap

* Keymap update 2018-05-30 01:53 UTC-7

* Added macro: T_PEEKR

* Added macro for MacOS Select All; modified MacOS function layer

* Added git branch-name macro

* Added GitHub signature macro

* Added readme files

* Added Quake 2 and System layers

* Refactored keymap readme

* Refactored to add userspace files; added Colemak layer

* Minor code cleanup; updated readme files

* Reverted use of userspace

Decided not to make use of the Userspace feature at this time. Reverted its addition, and updated the readme files where needed (they were linking to userspace files).

* Updated per review comments by @drashna

* Refactor buggy macros

I'm still not sure these work properly

* Fix Windows shortcuts

* Fix Mac shortcuts, possibly

Untested; still may be broken.

* Remove PREVENT_STUCK_MODIFIERS from config.h

Deprecated by #3107

2018-09-30 22:06:29 -07:00

1.9 KiB

Raw Blame History

@noroadsleft's Git aliases

Return to the directory index.

[alias]
    # 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"

    # 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

    # compact diff
    df = "diff --compact-summary"

    # Short-form status
    st = "!git status --short"

    # Returns the name of the current branch
    branch-name = "!git rev-parse --abbrev-ref HEAD"

    # short-form of the above
    bn = "!git branch-name"

    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"

    # Restore a file to the state it was in when checked out
    restore = "checkout --"

    # 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"

1.9 KiB Raw Blame History

@noroadsleft's Git aliases

1.9 KiB

Raw Blame History