This commit is contained in:
Tyrel Souza 2021-03-30 11:19:06 -04:00
parent 6b8535aad3
commit 1bebebb4d2
No known key found for this signature in database
GPG Key ID: 5A9394D4C30AEAC0
4 changed files with 23 additions and 8 deletions

View File

@ -33,6 +33,7 @@ function h () {
history | egrep "$@" history | egrep "$@"
fi fi
} }
function pulldep() { git pull; bundle; bundle exec rake db:migrate; }
settitle () { settitle () {
echo -ne "\033]0;"$*"\007" echo -ne "\033]0;"$*"\007"
@ -49,8 +50,8 @@ tide() {
# options # options
export LESS=-RFX #export LESS=-RFX
export PAGER="less" #export PAGER="less"
pullall (){ pullall (){
for d in ./*/ ; do (cd "$d" && pwd && git pull); done for d in ./*/ ; do (cd "$d" && pwd && git pull); done

Binary file not shown.

View File

@ -1,10 +1,11 @@
#!/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 # Lists the current directory's files in Vim, so you can edit it and save to rename them
# USAGE: vimv [file1 file2] # USAGE: vimv [file1 file2]
# https://github.com/thameera/vimv # 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 trap '{ rm -f "${FILENAMES_FILE}" ; }' EXIT
@ -22,7 +23,7 @@ ${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 for ((i=0;i<${#src[@]};++i)); do
if [ "${src[i]}" != "${dest[i]}" ]; then if [ "${src[i]}" != "${dest[i]}" ]; then
mkdir -p "`dirname "${dest[i]}"`" mkdir -p "`dirname "${dest[i]}"`"
@ -31,7 +32,7 @@ for ((i=0;i<${#src[@]};++i)); do
else else
mv "${src[i]}" "${dest[i]}" mv "${src[i]}" "${dest[i]}"
fi fi
((count++)) ((++count))
fi fi
done done

View File

@ -1,6 +1,8 @@
[core] [core]
excludesfile = /Users/tyrel/.gitignore_global excludesfile = /Users/tyrel/.gitignore_global
editor = vim editor = vim
symlinks = false
pager = less -F -X
[user] [user]
email = tyrelsouza@gmail.com email = tyrelsouza@gmail.com
name = Tyrel Souza name = Tyrel Souza
@ -35,6 +37,7 @@
logtree= "log --graph --oneline --decorate --all" # show a tree with branches merging logtree= "log --graph --oneline --decorate --all" # show a tree with branches merging
noop="!git commit --allow-empty -m 'no op'" 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 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>'" 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 od = "!$EDITOR $(git diff --name-only HEAD)" # Open all changed files differ from current HEAD
p = push p = push
@ -79,3 +82,13 @@
[mergetool "meld"] [mergetool "meld"]
trustExitCode = true trustExitCode = true
cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\" 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