Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Use gitconfig-user more widely and sensibly.

  • Loading branch information...
commit 1d3edc82273df719e9d2c545914c4b246839251c 1 parent 26a2d68
Mike McQuaid authored
2  gitconfig
@@ -78,6 +78,8 @@
78 78 patience = !git noff -Xpatience
79 79 # Hard reset branch to the upstream version.
80 80 hard-reset = !git reset --hard origin/$(git current-branch)
  81 + # Reset the current repository to the state on mikebook (my MacBook Pro) and clean it.
  82 + mikebook = !git fetch mikebook && git reset --hard mikebook/master && git clean -xdf
81 83
82 84 ## Shortened 'New' Commands
83 85 rem = !git rebase-against-master
11 gitconfig-user
@@ -3,9 +3,12 @@
3 3 name = Mike McQuaid
4 4 # Email used in commit messages.
5 5 email = mike@mikemcquaid.com
  6 +[shell]
  7 + # Default SSH username.
  8 + username = mike
  9 +[sourceforge]
  10 + # SourceForge username.
  11 + username = mikemcquaid
6 12 [github]
7   - # Set my GitHub username for command-line tools.
  13 + # GitHub username for command-line tools.
8 14 user = mikemcquaid
9   -[alias]
10   - # Reset the current repository to the state on mikebook (my MacBook Pro) and clean it.
11   - mikebook = !git fetch mikebook && git reset --hard mikebook/master && git clean -xdf
4 install-dotfiles.sh
@@ -26,6 +26,10 @@ for DOTFILE in *; do
26 26 [ -d $DOTFILE ] && DOTFILE="$DOTFILE/"
27 27 DIRFILE="$DOTFILESDIR/$DOTFILE"
28 28
  29 + # Don't install gitconfig-user unless you're also called Mike.
  30 + echo $DOTFILE | grep -q 'gitconfig-user' \
  31 + && echo $USER | grep -vq 'mike' && continue
  32 +
29 33 echo $DOTFILE | grep -q 'dotfiles' && continue
30 34
31 35 echo $DOTFILE | grep -q 'sublime' && HOMEFILE="$SUBLIME" \
4 shrc.sh
@@ -105,7 +105,7 @@ alias less="less --ignore-case --raw-control-chars"
105 105 alias rsync="rsync --partial --progress --human-readable --compress"
106 106 alias be="bundle exec"
107 107
108   -export HOMEBREW_SOURCEFORGE_USERNAME="mikemcquaid"
  108 +export HOMEBREW_SOURCEFORGE_USERNAME="$(git config sourceforge.username)"
109 109 alias upbrew="scp-to-http.sh $HOMEBREW_SOURCEFORGE_USERNAME,machomebrew frs.sourceforge.net /home/frs/project/m/ma/machomebrew/Bottles /Library/Caches/Homebrew/"
110 110
111 111 alias svn="svn-git.sh"
@@ -144,7 +144,7 @@ then
144 144 alias agdu="sudo apt-get dist-upgrade"
145 145 elif [ $WINDOWS ]
146 146 then
147   - quiet_which plink && alias ssh="plink -l mike"
  147 + quiet_which plink && alias ssh="plink -l $(git config shell.username)"
148 148
149 149 alias ls="ls -F --color=auto"
150 150

0 comments on commit 1d3edc8

Please sign in to comment.
Something went wrong with that request. Please try again.