wat
This commit is contained in:
parent
6b8535aad3
commit
1bebebb4d2
@ -33,6 +33,7 @@ function h () {
|
||||
history | egrep "$@"
|
||||
fi
|
||||
}
|
||||
function pulldep() { git pull; bundle; bundle exec rake db:migrate; }
|
||||
|
||||
settitle () {
|
||||
echo -ne "\033]0;"$*"\007"
|
||||
@ -49,8 +50,8 @@ tide() {
|
||||
|
||||
|
||||
# options
|
||||
export LESS=-RFX
|
||||
export PAGER="less"
|
||||
#export LESS=-RFX
|
||||
#export PAGER="less"
|
||||
|
||||
pullall (){
|
||||
for d in ./*/ ; do (cd "$d" && pwd && git pull); done
|
||||
|
BIN
bin/tidelift
BIN
bin/tidelift
Binary file not shown.
13
bin/vimv
13
bin/vimv
@ -1,17 +1,18 @@
|
||||
#!/bin/bash
|
||||
#!/usr/bin/env bash
|
||||
set -eu
|
||||
|
||||
# Lists the current directory's files in Vim, so you can edit it and save to rename them
|
||||
# USAGE: vimv [file1 file2]
|
||||
# https://github.com/thameera/vimv
|
||||
|
||||
declare -r FILENAMES_FILE="$(mktemp --tmpdir vimv.XXX)"
|
||||
declare -r FILENAMES_FILE=$(mktemp "${TMPDIR:-/tmp}/vimv.XXX")
|
||||
|
||||
trap '{ rm -f "${FILENAMES_FILE}" ; }' EXIT
|
||||
|
||||
if [ $# -ne 0 ]; then
|
||||
src=( "$@" )
|
||||
else
|
||||
IFS=$'\r\n' GLOBIGNORE='*' command eval 'src=($(ls))'
|
||||
IFS=$'\r\n' GLOBIGNORE='*' command eval 'src=($(ls))'
|
||||
fi
|
||||
|
||||
for ((i=0;i<${#src[@]};++i)); do
|
||||
@ -20,9 +21,9 @@ done
|
||||
|
||||
${EDITOR:-vi} "${FILENAMES_FILE}"
|
||||
|
||||
IFS=$'\r\n' GLOBIGNORE='*' command eval 'dest=($(cat "${FILENAMES_FILE}"))'
|
||||
IFS=$'\r\n' GLOBIGNORE='*' command eval 'dest=($(cat "${FILENAMES_FILE}"))'
|
||||
|
||||
count=0
|
||||
declare -i count=0
|
||||
for ((i=0;i<${#src[@]};++i)); do
|
||||
if [ "${src[i]}" != "${dest[i]}" ]; then
|
||||
mkdir -p "`dirname "${dest[i]}"`"
|
||||
@ -31,7 +32,7 @@ for ((i=0;i<${#src[@]};++i)); do
|
||||
else
|
||||
mv "${src[i]}" "${dest[i]}"
|
||||
fi
|
||||
((count++))
|
||||
((++count))
|
||||
fi
|
||||
done
|
||||
|
||||
|
13
gitconfig
13
gitconfig
@ -1,6 +1,8 @@
|
||||
[core]
|
||||
excludesfile = /Users/tyrel/.gitignore_global
|
||||
editor = vim
|
||||
symlinks = false
|
||||
pager = less -F -X
|
||||
[user]
|
||||
email = tyrelsouza@gmail.com
|
||||
name = Tyrel Souza
|
||||
@ -35,6 +37,7 @@
|
||||
logtree= "log --graph --oneline --decorate --all" # show a tree with branches merging
|
||||
noop="!git commit --allow-empty -m 'no op'"
|
||||
ob = "!$EDITOR $(git diff --name-only origin/main)" # Open all files in editor that differ between origin/main and staged/unstaged
|
||||
amanda = "!git commit --amend --author='Amanda P McDermott <amanda@tidelift.com>'"
|
||||
oscar = "!git commit --amend --author='Oscar Spencer <oscar@tidelift.com>'"
|
||||
od = "!$EDITOR $(git diff --name-only HEAD)" # Open all changed files differ from current HEAD
|
||||
p = push
|
||||
@ -79,3 +82,13 @@
|
||||
[mergetool "meld"]
|
||||
trustExitCode = true
|
||||
cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"
|
||||
[protocol "http"]
|
||||
allow = never
|
||||
[protocol "git"]
|
||||
allow = never
|
||||
[fetch]
|
||||
fsckObjects = true
|
||||
[transfer]
|
||||
fsckObjects = true
|
||||
[receive]
|
||||
fsckObjects = true
|
||||
|
Loading…
Reference in New Issue
Block a user