Skip to content

Commit

Permalink
Merge pull request #13 from PiroHiroPiro/change_default_branch_name_t…
Browse files Browse the repository at this point in the history
…o_main

Change default branch name to main
  • Loading branch information
PiroHiroPiro authored Aug 22, 2023
2 parents 6d5b2be + a641fd7 commit 92756f3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Now supports the following OS:
## Setup

```shell
$ curl -sSL https://raw.githubusercontent.com/PiroHiroPiro/dotfiles_for_server/master/install.sh | bash
$ curl -sSL https://raw.githubusercontent.com/PiroHiroPiro/dotfiles_for_server/main/install.sh | bash
```

## References
Expand Down
4 changes: 2 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ echo "##### download dotfiles #####"
install_if_not_exist curl
install_if_not_exist tar

curl -sSL "https://github.com/PiroHiroPiro/dotfiles_for_server/archive/master.tar.gz" | tar -zxv
curl -sSL "https://github.com/PiroHiroPiro/dotfiles_for_server/archive/main.tar.gz" | tar -zxv
# 解凍したら,DOTPATH に置く
mv -f dotfiles_for_server-master $DOTPATH
mv -f dotfiles_for_server-main $DOTPATH

cd "${DOTPATH}"

Expand Down
5 changes: 2 additions & 3 deletions zsh/.zsh_aliases
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ alias dc="docker-compose"
# more alias for git
alias g="git"
alias gb="git branch"
alias gc="git checkout"
alias gd="git diff"
alias gs="git status"
alias gcm="git checkout master"
alias gpom="git pull origin master"
alias gcm="git checkout main"
alias gpom="git pull origin main"

# more alias for tmux
alias t="tmux"

0 comments on commit 92756f3

Please sign in to comment.