Skip to content

Commit

Permalink
configurable source branch
Browse files Browse the repository at this point in the history
  • Loading branch information
dlikhten committed Oct 11, 2019
1 parent bd02adb commit 2a27c18
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[user]
name = Dmitriy Likhten
email = [email protected]
email = [email protected]
[color]
branch = auto
diff = auto
Expand All @@ -19,7 +19,8 @@
undo-commit = reset --soft HEAD^
list-ignored = !git ls-files -v | grep \"^[[:lower:]]\"
github-location = "!f() { git remote -v | grep 'origin' | grep '(push)' | sed 's/.*[email protected]://' | sed 's/\\.git.*//'; }; f"
pull-request = !git push origin && open "https://github.com/`git github-location`/compare/develop...`git symbolic-ref --short HEAD`"
source-branch = echo 'develop'
pull-request = !git push origin && open "https://github.com/`git github-location`/compare/`git source-branch`...`git symbolic-ref --short HEAD`"
p = push origin
pf = push origin --force
pr = pull --rebase dc-master resolved
Expand All @@ -29,12 +30,12 @@
[push]
default = current
[core]
excludesfile = /Users/dlikhten/.gitignore_global
excludesfile = /Users/dmitriy/.gitignore_global
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[help]
autocorrect = 10
Expand All @@ -47,3 +48,5 @@

[rebase]
autostash = true
[commit]
template = /Users/dmitriy/.stCommitMsg

0 comments on commit 2a27c18

Please sign in to comment.