diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/propose_git.md | 2 | ||||
| -rw-r--r-- | src/main/java/pt.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/propose_git.md b/src/main/java/com/gitblit/wicket/pages/propose_git.md index 39ff859e..d52e1332 100644 --- a/src/main/java/com/gitblit/wicket/pages/propose_git.md +++ b/src/main/java/com/gitblit/wicket/pages/propose_git.md @@ -2,5 +2,5 @@ cd ${repo} git checkout -b ${reviewBranch} origin/${integrationBranch} ... - git push --set-upstream origin ${reviewBranch} + git push -u origin ${reviewBranch} diff --git a/src/main/java/pt.py b/src/main/java/pt.py index 3b35c167..fcfe5006 100644 --- a/src/main/java/pt.py +++ b/src/main/java/pt.py @@ -289,7 +289,7 @@ def propose(args): # set the upstream branch configuration args.id = int(fields[1].strip()[len('--> #'):]) __call(['git', 'fetch', args.remote]) - __call(['git', 'branch', '--set-upstream-to={}/ticket/{:d}'.format(args.remote, args.id)]) + __call(['git', 'branch', '-u', '{}/ticket/{:d}'.format(args.remote, args.id)]) break return |