Skip to content

Доработки gitsync tags push tempdir authors branch #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 30 commits into from
Closed

Доработки gitsync tags push tempdir authors branch #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7fbcb44
Добавление отправки на удаленный репо каждые n - коммитов
khorevaa Nov 15, 2016
d5bc168
Добавлена возможность указания ветки при пакетной синхронизации
khorevaa Nov 15, 2016
1a0a08b
Исправлен вызов процедуры синхронизации с новыми параметрами
khorevaa Nov 15, 2016
e3d7583
Merge pull request #1 in OS/gitsync from feature/Добавление-Pull-кажд…
khorevaa Nov 15, 2016
e9aca5e
Merge remote-tracking branch 'origin/master' into feature/добавление-…
khorevaa Nov 15, 2016
017dd91
Merge pull request #2 in OS/gitsync from feature/добавление-параметра…
khorevaa Nov 15, 2016
bc4631d
Добавлена возможность указания Temp каталога
khorevaa Nov 15, 2016
065f230
Дорабавлен ключ "-tempcatalog"
khorevaa Nov 15, 2016
7d55345
Исправлена ошибка преобразования типов
khorevaa Nov 15, 2016
f2decf7
Merge pull request #3 in OS/gitsync from feature/добавление-возможост…
khorevaa Nov 15, 2016
b2e6edb
Merge pull request #4 in OS/gitsync from release/0.1 to master
khorevaa Nov 15, 2016
001d307
Automatic merge from master -> develop
khorevaa Nov 15, 2016
368a923
Переработка хранения файла AUTHORS
Nov 15, 2016
d8cc5f0
Merge branch 'master' into new-author-format
Nov 15, 2016
0522705
Merge branch 'develop' into new-author-format
khorevaa Nov 16, 2016
f6218ff
Исправлены баги.
khorevaa Nov 16, 2016
706464c
Очередная правка багов
khorevaa Nov 16, 2016
b260cc9
Merge pull request #5 in OS/gitsync from new-author-format to develop
khorevaa Nov 16, 2016
9af89bf
Merge pull request #6 in OS/gitsync from release/0.2 to master
khorevaa Nov 16, 2016
edd5938
Automatic merge from master -> develop
khorevaa Nov 16, 2016
5903a43
Доработка передачи Tags
khorevaa Nov 17, 2016
8e913cf
Доработка исправление багов
khorevaa Nov 17, 2016
274e370
Переименование название параметра tempcatalog
khorevaa Nov 18, 2016
e2b2f26
Доработан автоматичесое присвоение Tags и их Push
khorevaa Nov 22, 2016
572a829
Завершено добавление-установки-тегов-по-версиям
khorevaa Nov 22, 2016
2e6d894
Получение последних изменений из 'develop' into new-author-format
khorevaa Nov 22, 2016
3145631
Изменен формат хранения AURHORS
khorevaa Nov 22, 2016
92f3e8c
Merge remote-tracking branch 'origin/new-author-format' into develop
khorevaa Nov 22, 2016
7556d0a
Изменен вызов команды push. Исправлены мелкие баги
khorevaa Nov 22, 2016
f31d149
Finish Изменение-команды-push
khorevaa Nov 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Поместите параметры в этот файл, чтобы перезаписать параметры по умолчанию и пользовательские параметры.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Этот файл разве нужен в гите? Пустой по крайней мере.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не нужен.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Да не корректный gitignore...

{
}
64 changes: 64 additions & 0 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"version": "0.1.0",
"command": "oscript",
"isShellCommand": true,
"showOutput": "silent",
"args": [
"-encoding=utf-8"
],
"tasks": [
{
"taskName": "OneScript: compile",
"args": [
"-compile",
"${file}"
],
"echoCommand": true,
"showOutput": "always",
"suppressTaskName": true,
"isBuildCommand": false
},
{
"taskName": "OneScript: check",
"args": [
"-check",
"${file}"
],
"echoCommand": true,
"showOutput": "always",
"suppressTaskName": true,
"isBuildCommand": false
},
{
"taskName": "OneScript: make",
"args": [
"-make",
"${file}",
"${fileBasename}.exe"
],
"echoCommand": true,
"showOutput": "always",
"suppressTaskName": true,
"isBuildCommand": false
},
{
"taskName": "OneScript: run",
"args": [
"${file}"
],
"echoCommand": true,
"showOutput": "always",
"suppressTaskName": true,
"isBuildCommand": true,
"problemMatcher": {
"fileLocation": "absolute",
"pattern": {
"regexp": "^{Модуль\\s+(.*)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+(.*)}$",
"file": 1,
"location": 2,
"message": 3
}
}
}
]
}
Loading