Permalink
Browse files
Use gitconfig-user more widely and sensibly.
- Loading branch information...
Showing
with
15 additions
and
6 deletions.
-
+2
−0
gitconfig
-
+7
−4
gitconfig-user
-
+4
−0
install-dotfiles.sh
-
+2
−2
shrc.sh
|
@@ -78,6 +78,8 @@ |
|
|
patience = !git noff -Xpatience
|
|
|
# Hard reset branch to the upstream version.
|
|
|
hard-reset = !git reset --hard origin/$(git current-branch)
|
|
|
+ # Reset the current repository to the state on mikebook (my MacBook Pro) and clean it.
|
|
|
+ mikebook = !git fetch mikebook && git reset --hard mikebook/master && git clean -xdf
|
|
|
|
|
|
## Shortened 'New' Commands
|
|
|
rem = !git rebase-against-master
|
|
|
|
@@ -3,9 +3,12 @@ |
|
|
name = Mike McQuaid
|
|
|
# Email used in commit messages.
|
|
|
email = mike@mikemcquaid.com
|
|
|
+[shell]
|
|
|
+ # Default SSH username.
|
|
|
+ username = mike
|
|
|
+[sourceforge]
|
|
|
+ # SourceForge username.
|
|
|
+ username = mikemcquaid
|
|
|
[github]
|
|
|
- # Set my GitHub username for command-line tools.
|
|
|
+ # GitHub username for command-line tools.
|
|
|
user = mikemcquaid
|
|
|
-[alias]
|
|
|
- # Reset the current repository to the state on mikebook (my MacBook Pro) and clean it.
|
|
|
- mikebook = !git fetch mikebook && git reset --hard mikebook/master && git clean -xdf
|
|
@@ -26,6 +26,10 @@ for DOTFILE in *; do |
|
|
[ -d $DOTFILE ] && DOTFILE="$DOTFILE/"
|
|
|
DIRFILE="$DOTFILESDIR/$DOTFILE"
|
|
|
|
|
|
+ # Don't install gitconfig-user unless you're also called Mike.
|
|
|
+ echo $DOTFILE | grep -q 'gitconfig-user' \
|
|
|
+ && echo $USER | grep -vq 'mike' && continue
|
|
|
+
|
|
|
echo $DOTFILE | grep -q 'dotfiles' && continue
|
|
|
|
|
|
echo $DOTFILE | grep -q 'sublime' && HOMEFILE="$SUBLIME" \
|
|
|
|
@@ -105,7 +105,7 @@ alias less="less --ignore-case --raw-control-chars" |
|
|
alias rsync="rsync --partial --progress --human-readable --compress"
|
|
|
alias be="bundle exec"
|
|
|
|
|
|
-export HOMEBREW_SOURCEFORGE_USERNAME="mikemcquaid"
|
|
|
+export HOMEBREW_SOURCEFORGE_USERNAME="$(git config sourceforge.username)"
|
|
|
alias upbrew="scp-to-http.sh $HOMEBREW_SOURCEFORGE_USERNAME,machomebrew frs.sourceforge.net /home/frs/project/m/ma/machomebrew/Bottles /Library/Caches/Homebrew/"
|
|
|
|
|
|
alias svn="svn-git.sh"
|
|
@@ -144,7 +144,7 @@ then |
|
|
alias agdu="sudo apt-get dist-upgrade"
|
|
|
elif [ $WINDOWS ]
|
|
|
then
|
|
|
- quiet_which plink && alias ssh="plink -l mike"
|
|
|
+ quiet_which plink && alias ssh="plink -l $(git config shell.username)"
|
|
|
|
|
|
alias ls="ls -F --color=auto"
|
|
|
|
|
|
0 comments on commit
1d3edc8