Tony Duckles [Mon, 31 Dec 2012 15:33:23 +0000 (09:33 -0600)]
.vimrc: Ignore errors during Pathogen init
Some of the internal hosts have older versions of VIM, e.g. 6.3 or
6.4, which don't support Pathogen. Suppress any errors doing the
Pathogen initialization to avoid annoying messages when using VIM on
those hosts.
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, 25 Aug 2012 16:43:05 +0000 (11:43 -0500)]
.profile: ksh login script
The default shell on most internal hosts is ksh which executes
~/.profile. Try to exec bash if it's available on the current host,
so that we can use all the fancy stuff in .bash_profile/.bashrc.
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'.
git.nynim.org / dotfiles.git / log