Просмотр исходного кода

Switch to -u from deprecated --set-upstream

tags/v1.6.0
James Moger 10 лет назад
Родитель
Сommit
d69d73e5da

+ 1
- 1
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}


+ 1
- 1
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

+ 2
- 2
src/site/tickets_using.mkd Просмотреть файл

@@ -28,7 +28,7 @@ Any authenticated user who can clone your repository.
...add a single commit...
git push origin HEAD:refs/for/new
# read ticket id from server output
git branch --set-upstream-to=origin/ticket/{id}
git branch -u origin/ticket/{id}

### Creating the first Patchset for an Existing Ticket

@@ -42,7 +42,7 @@ Any authenticated user who can clone your repository.
cd repo
git checkout -b ticket/{id}
...add one or more commits...
git push --set-upstream origin ticket/{id}
git push -u origin ticket/{id}

### Safely adding commits to a Patchset for an Existing Ticket


Загрузка…
Отмена
Сохранить