Skip to content

Commit

Permalink
Removes bash_it references
Browse files Browse the repository at this point in the history
- Includes removal of some git aliases with bash_it references
- A few branding fixes, too.
  • Loading branch information
joemoore committed Aug 25, 2021
1 parent 55103ff commit 8f0164c
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .pairs
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ pairs:

email:
prefix: pair
domain: vmware.com
domain: example.com

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Workstation Setup

This project automates the process of setting up a new Pivotal machine using a simple [Bash](https://www.gnu.org/software/bash/) script.
This project automates the process of setting up a new development machine using a simple [Bash](https://www.gnu.org/software/bash/) script.

## Goals

Expand Down
8 changes: 4 additions & 4 deletions files/.pairs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pairs:
bk: Brian Kelly; bkelly
ah: Ashraf Hanafy; ahanafy
# Examples below (without # comment of course):
# aa: Aaron A Aaronson; aaronson
# mm: Mary Miles; mmiles

email:
prefix: pair
domain: pivotal.io

domain: example.com
21 changes: 0 additions & 21 deletions files/bobby_pivotal/bobby_pivotal.theme.bash

This file was deleted.

13 changes: 1 addition & 12 deletions scripts/common/git-aliases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,4 @@ git config --global alias.fixup "commit --fixup"
git config --global alias.squash "commit --squash"
git config --global alias.amendit "commit --amend --no-edit"
git config --global alias.unstage "reset HEAD"
git config --global alias.rum "rebase master@{u}"
if [ ! -d ~/.bash_it/aliases/enabled ]; then
mkdir ~/.bash_it/aliases/enabled
fi
echo "#Git" >> ~/.bash_it/aliases/enabled/general.aliases.bash
echo "alias gst='git status'" >> ~/.bash_it/aliases/enabled/general.aliases.bash

#Add git duet aliases
echo "alias dci='git duet-commit'" >> ~/.bash_it/aliases/enabled/general.aliases.bash
echo "alias drv='git duet-revert'" >> ~/.bash_it/aliases/enabled/general.aliases.bash
echo "alias dmg='git duet-merge'" >> ~/.bash_it/aliases/enabled/general.aliases.bash
echo "alias drb=\"git rebase -i --exec 'git duet-commit --amend --reset-author'\"" >> ~/.bash_it/aliases/enabled/general.aliases.bash
git config --global alias.rum "rebase master@{u}"
2 changes: 1 addition & 1 deletion setup.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# setup.sh: run the Pivotal workstation setup
# setup.sh: run the workstation setup
#
# Arguments:
# - a list of components to install, see scripts/opt-in/ for valid options
Expand Down

0 comments on commit 8f0164c

Please sign in to comment.