feat(up, start): prefer upstream remote over origin

.travis.yml

@@ -18,6 +18,7 @@ script:
   - yarn commitlint-travis
   - yarn install --production
   - git aliases
+  - GIT_REMOTE=$(git upstream-or-origin) && [ "$GIT_REMOTE" = "origin" ]
   - node lib/remove-config.test
 after_success:
   - yarn install --ignore-scripts

commitizen.config.js

@@ -62,7 +62,8 @@ const scopes = [
   'log',
   'status',
   'branch-name',
-  'develop-branch'
+  'develop-branch',
+  'upstream-or-origin'
 ].map(name => ({ name }));
 
 module.exports = {

src/jlegrone.gitconfig

@@ -14,11 +14,11 @@
   # Update your current branch from develop
   # ** Rewrites history **
   # Usage: git up
-  up = "!git pull --rebase --autostash origin $(git develop-branch)"
+  up = "!git pull --rebase --autostash $(git upstream-or-origin) $(git develop-branch)"
 
   # Start a feature branch based off of latest develop branch
   # Usage: git start <name-of-feature>
-  start = "!sh -c \"git checkout $(git develop-branch) && git pull && git cb feature/$1\" -"
+  start = "!sh -c \"git checkout $(git develop-branch) && git up && git cb feature/$1\" -"
 
   # Start a hotfix branch based off of latest master branch
   # Usage: git hotfix <name-of-production-patch>
@@ -86,3 +86,6 @@
 
   # Get the develop branch (used in other aliases)
   develop-branch = "!(git show-ref --quiet refs/heads/develop && echo develop) || echo master"
+
+  # Get remote name (prefer upstream over origin)
+  upstream-or-origin = "!(git remote | grep upstream) || echo origin"