diff --git a/aliases b/aliases index 6f135f0..c7f9ee8 100644 --- a/aliases +++ b/aliases @@ -341,11 +341,12 @@ alias ammend='echo "use am instead"' alias amend='echo "use am instead"' alias g='gitCmdWrapper' alias ga='git add -A' -alias gaa='git add -A; gdc' +alias gaa='git add -A; gdcc' alias gap='git add -Ap' alias gau='git add --update' alias gb='git branch -v' alias gbd='git branch -D' +alias gbdr='git branch -Dr' alias gbl='git branch --all' alias gblm='git blame -wMC' alias gbm='git branch -m' @@ -368,12 +369,13 @@ alias gcpa='git cherry-pick --abort' alias gcpc='git cherry-pick --continue' alias gcps='git cherry-pick -n' alias gd='git diff' -alias gdc='git diff --cached --color-words' +alias gdc='git diff --cached' +alias gdcc='git diff --cached --color-words' alias gdm='git diff master' alias gds='git diff --stat=160,120' alias gf='git fetch' alias gfa='git fetch --all' -alias gfd='git fetch --prune' +alias gfd='git fetch --prune' # Removes remote branches that don't have a counterpart branch on the remote. alias gfix="git commit --amend -C HEAD" alias gfixx="git commit --amend -C HEAD ; gp -f" alias gfixs="git commit -S -a --amend -C HEAD" # signed diff --git a/script_helpers/clang.sh b/script_helpers/clang.sh new file mode 100644 index 0000000..e8ce9f0 --- /dev/null +++ b/script_helpers/clang.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +#--------------------------------------------------------------------------------------------------- +# API +#--------------------------------------------------------------------------------------------------- + +get_clang_bin_path() { + declare -n _path=$1 + + _path="C:\Program Files\LLVM\bin" + + if [[ ! -d $_path ]]; then + error "Was unable to find LLVM at "$_path".\n" + exit 1 + fi + + # Fix up the path + _path="/${_path/:/}" # Remove ':'. + _path="${_path//\\//}" # Remove Windows slashes. + _path="${_path// /\\ }" # Add a backslash before spaces. + + # Assuming X64. + printf "${BOLD}${YELLOW}[Clang X64]${NORMAL}\n" +} + diff --git a/vim/after/plugin/abolish.vim b/vim/after/plugin/abolish.vim index d9b7233..e649db1 100644 --- a/vim/after/plugin/abolish.vim +++ b/vim/after/plugin/abolish.vim @@ -12,3 +12,4 @@ Abolish constnat constant Abolish darw draw Abolish transfered transferred Abolish transfering transferring +Abolish haev have diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add index 6157e65..4cb244f 100644 --- a/vim/spell/en.utf-8.add +++ b/vim/spell/en.utf-8.add @@ -261,3 +261,4 @@ ui weapon fov exe +bitangent diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl index 0321912..1f834ac 100644 Binary files a/vim/spell/en.utf-8.add.spl and b/vim/spell/en.utf-8.add.spl differ