vahagn/scripts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git: setup-upstream script and refresh-master.

Browse Source
This commit is contained in:
Vahagn Khachatryan
2020-06-22 10:39:27 -04:00
parent 227c9d884b
commit d945cea0c3
2 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/.gitconfig
View File

@@ -17,6 +17,8 @@
faxm = "!f(){ git fetch upstream master && git checkout -b ENG1FAXM-$1 upstream/master; }; f"
drqs = "!f(){ git fetch upstream master && git checkout -b DRQS-$1 upstream/master; }; f"
install-hooks = "!f(){ GIT_HOOKS=\"$(git rev-parse --git-dir)/hooks/\"; GOLDEN_HOOKS=\"$HOME/devel/scripts/git/hooks\"; [ -d \"$GIT_HOOKS\" ] && [ -d \"$GOLDEN_HOOKS\" ] && cp -r \"$GOLDEN_HOOKS/.\" \"$GIT_HOOKS\"; }; f"
refresh-master = "!f(){ git fetch upstream master; git checkout upstream/master; git branch -D master; git checkout -b master; }; f"
setup-upstream = "!source $HOME/devel/scripts/git/setup-upstream.sh"
[merge]
tool = vimdiff
conflictstyle = diff3