diff options
| author | dakkar <dakkar@thenautilus.net> | 2021-03-19 18:04:26 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2021-03-19 18:04:26 +0000 |
| commit | 20fa2b6be224d4d3b23d629d2634c0704ff21957 (patch) | |
| tree | c9627f6325cb564973264395e53b6ab24090b131 | |
| parent | emacs tweaks (diff) | |
| parent | some git stuff (diff) | |
| download | dotfiles-20fa2b6be224d4d3b23d629d2634c0704ff21957.tar.gz dotfiles-20fa2b6be224d4d3b23d629d2634c0704ff21957.tar.bz2 dotfiles-20fa2b6be224d4d3b23d629d2634c0704ff21957.zip | |
Merge remote-tracking branch 'origin/master' into nautilus
| -rw-r--r-- | .bash_profile | 10 | ||||
| -rw-r--r-- | .gitconfig | 18 |
2 files changed, 24 insertions, 4 deletions
diff --git a/.bash_profile b/.bash_profile index c0a4f1b..a1cb3d5 100644 --- a/.bash_profile +++ b/.bash_profile @@ -14,11 +14,11 @@ export GPG_TTY="$(tty)" eval "$(keychain --eval --inherit any-once --agents ssh id_rsa)" function e() { - emacsclient "$@" + emacsclient -n "$@" } function se() { - emacsclient "${@/#//sudo::}" + emacsclient -n "${@/#//sudo::}" } function pd() { @@ -44,6 +44,12 @@ function pm() { emacsclient -c -n "$fn" } +function killmerged() { + for b in $(git branch --merged HEAD --no-contains HEAD|grep -vE 'stage|master|svn|develop'); do + git branch -d $b && git push origin :$b + done +} + export PERLDOC='-MPod::Text::Color::Delight' fortune @@ -14,15 +14,28 @@ showbranch = true status = true +[color.diff] + oldMoved = normal red + oldMovedDimmed = normal red dim + oldMovedAlternative = normal red italic + oldMovedAlternativeDimmed = normal red italic dim + newMoved = normal green + newMovedDimmed = normal green dim + newMovedAlternative = normal green italic + newMovedAlternativeDimmed = normal green italic dim + [fetch] - prune = true + prune = true +[fetch.fsck] + zeroPaddedFilemode = warn [push] default = tracking [pull] - rebase = preserve + rebase = merges [diff] mnemonicprefix = true renames = copies + colorMoved = zebra [log] decorate = short date = iso @@ -41,3 +54,4 @@ refl = log -g --oneline 'HEAD@{now}' --date=relative st = status -bs tracked = ls-tree -r --name-only --full-name HEAD + stashed = stash list --pretty=format:'%gd: %Cred%h%Creset %Cgreen[%ar]%Creset %gs' |