Tony Duckles [Fri, 25 Jan 2013 04:55:43 +0000 (22:55 -0600)]
.screenrc: $TERM="screen"
Go back to using TERM=screen for screen sessions. Never ended-up
needing 256-color support, and having TERM=screen allows for writing
scripts that have handling specific to screen-sessions.
Refactor the 'git-subup' (submodule update) script to only
conditionally pull changes from each submodule's origin remote.
"git subup" will just ensure all submodules are checked-out.
"git subup pull" will additionally do a pull on each submodule to
look for updates.
* Use '--recursive' flag for update/sync/foreach subcommands to
update any child submodules of first-level submodules.
* Conditionalize 'git pull' handling only if $1 == "pull".
* Don't assume that "remotes/origin/HEAD" is a valid ref; not all
repo's will have an "origin/HEAD" ref. Instead, just force-update
local "master" branch based on the current checked-out rev, so
that when 'git submodule update --checkout' creates a detached
HEAD we'll update our local 'master' branch to jive with HEAD so
that any later 'git pull' will show all new revisions compared to
the previous HEAD.
Tony Duckles [Mon, 21 Jan 2013 02:23:16 +0000 (20:23 -0600)]
.term_colorpalette: Tweak 'blue' and 'white' colors
* Brighten 'blue' so that it's more readable against dark
backgrounds.
* Darken 'white' so that it's more gray than white:
Black = Black , BrBlack = DarkGrey, White = Gray, BrWhite=White
* Brighten 'black' a wee-wee-bit.
Tony Duckles [Sun, 6 Jan 2013 06:59:51 +0000 (00:59 -0600)]
.vimrc: Color (highlight) tweaks
* Set Visual (visual-block) color to be white-on-green to match ack
and grep color-scheme. Nice and low-contrast-y.
* Tweak guifg/guibg colors for MacVim.
Tony Duckles [Sat, 5 Jan 2013 19:16:04 +0000 (13:16 -0600)]
bin/git-subup: Always checkout origin/HEAD
Some submodule repo's have an origin/HEAD of something other than
"master". Force a checkout of origin/HEAD -> master so that the
later pull will track updates from the repo's default HEAD.
Tony Duckles [Sat, 5 Jan 2013 02:51:54 +0000 (20:51 -0600)]
.vimrc: Custom statusline, lots of new helper mappings
* Custom statusline which includes &fenc, &ff, etc.
* A bunch of neat misc helper leader-based mappings, inspired by
https://github.com/carlhuda/janus.
* Don't jump to last position in gitcommit file.
* Use real tabs (not spaces) for Makefiles
Tony Duckles [Fri, 4 Jan 2013 07:28:59 +0000 (01:28 -0600)]
.inputrc: Add some helper reminds in comments at top
Add some tips about how to use the 'bind' built-in to view the
current readline config and where to look for additional detail
documentation on all these readline bindings.
Tony Duckles [Thu, 3 Jan 2013 02:16:35 +0000 (20:16 -0600)]
.bashrc: Add brew coreutils to $PATH
Need to have GNU-style coreutils installed to keep me sane. By
default all the coreutils will be installed with g* prefix. Need to
add "/usr/local/opt/coreutils/libexec/gnubin" at the start of $PATH
so that the coreutils versions win.
Also, remove Fink handling. Haven't used Fink in years now...
Tony Duckles [Thu, 27 Dec 2012 04:00:40 +0000 (22:00 -0600)]
.gitconfig: No limit on "git ll"
"git ll" alias previously only showed up to 16 log entries. "git ll"
was an unlimited version. Eliminate "git lll" entirely and make "git
ll" unlimited instead.
Tony Duckles [Sat, 22 Dec 2012 18:52:06 +0000 (12:52 -0600)]
.bashrc: Use __git_ps1() in $PS1
Use __git_ps1() to display current branch info in bash prompt (PS1).
* Never show this for the $HOME (dotfiles) repo since it would get
obnoxious.
* Check a (custom) `git config` variable to allow repo-specific
exclusion of __git_ps1() handling.
Tony Duckles [Sat, 22 Dec 2012 03:57:05 +0000 (21:57 -0600)]
bin/git-up: Rewrite to support 'git fetch --all --prune'
* Use "[git fetch] --all --prune" (if no given <repo>+<head>) to
fetch changes from all remotes and prune nonexistent branches.
* Use "[git merge] --ff-only" to ensure we only do fast-forward
merge from `git pull`.
* Grab HEAD before and after pull to see if changed. Previous code
relied on HEAD@{1} (i.e. git reflog) which is a false-positive if
HEAD didn't actually change during pull.
Tony Duckles [Tue, 18 Sep 2012 22:58:15 +0000 (17:58 -0500)]
.screenrc: altscreen=on (alternate buffer)
xterm-style emulators support the notion of an alternate buffer with
a separate scroll-back history than the "normal" buffer. By default
GNU screen has the alternate buffer disabled, but we want it enabled
so that alternate buffer switching works as expected (when using an
xterm-supporting terminal emulator) for applications that try to use
that it, e.g. vim, etc.
Tony Duckles [Sat, 4 Aug 2012 14:35:19 +0000 (09:35 -0500)]
.bashrc: export LESS="-FiRX"
For non-screen'd shells, found that output that was less than a
screenful was causing 'less' to: switch to temporary buffer, show
output, terminate since it was less than a screenful (-F), and then
return to original screen. Ugh. Passing -X (no termcap init) seems
to fix this.
Tony Duckles [Fri, 3 Aug 2012 04:19:04 +0000 (23:19 -0500)]
bin/git-subup: Force "git checkout master" foreach submodule
Running "git submodule update --init" rewinds HEAD in each of the
submodule directories to point to the revision set in the parent
working copy. This could result in a broken HEAD pointer. To avoid
weird submodule state, always do a forced "git checkout master" for
each submodule after running the init/update and sync.
Tony Duckles [Fri, 4 May 2012 03:00:01 +0000 (22:00 -0500)]
git-incoming and outgoing updates
* git-outgoing: Support -d/--diff option.
* git-outgoing, git-incoming: Use single -c argument to cut, for
compatibility with GNU (coreutils) version of 'cut'.