diff --git a/bash_aliases.d/git b/bash_aliases.d/git index 9d16dd1..41064b4 100644 --- a/bash_aliases.d/git +++ b/bash_aliases.d/git @@ -28,6 +28,9 @@ function git-config-joshs() git config --global init.defaultBranch master # Only use configured user.name/user.email; do not guess them git config --global user.useConfigOnly true + # Do not automatically mark my branch as tracking the remote branch that I + # happened to use as the starting point. + git config --global branch.autoSetupMerge false } function git-config-local-personal() { diff --git a/bash_profile b/bash_profile new file mode 100644 index 0000000..a825e1b --- /dev/null +++ b/bash_profile @@ -0,0 +1,2 @@ +source $HOME/.profile +source $HOME/.bashrc diff --git a/install-files b/install-files index b85ac0a..94c2911 100755 --- a/install-files +++ b/install-files @@ -21,6 +21,9 @@ def install_file(src, dst): files = [ ('bash_aliases', '.bash_aliases'), + ('bash_aliases.d', '.bash_aliases.d'), + ('bash_profile', '.bash_profile'), + ('profile', '.profile'), ('inputrc', '.inputrc'), ('screenrc', '.screenrc'), ('gitignore', '.gitignore'), diff --git a/profile b/profile new file mode 100644 index 0000000..57c89eb --- /dev/null +++ b/profile @@ -0,0 +1,2 @@ +export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket" +export PATH="$HOME/bin":"$PATH"