|
| 1 | +== Список змінених файлів |
| 2 | + |
| 3 | +Конфлікти у файлах: |
| 4 | + |
| 5 | +|=== |
| 6 | +| Назва файлу |Статус (+ означає зроблено) |
| 7 | +| book/01-introduction/sections/about-version-control.asc | |
| 8 | +| book/01-introduction/sections/command-line.asc | |
| 9 | +| book/01-introduction/sections/first-time-setup.asc | |
| 10 | +| book/01-introduction/sections/help.asc | |
| 11 | +| book/01-introduction/sections/history.asc | |
| 12 | +| book/01-introduction/sections/installing.asc | |
| 13 | +| book/01-introduction/sections/what-is-git.asc | |
| 14 | +| book/02-git-basics/sections/aliases.asc | |
| 15 | +| book/02-git-basics/sections/getting-a-repository.asc | |
| 16 | +| book/02-git-basics/sections/recording-changes.asc | |
| 17 | +| book/02-git-basics/sections/remotes.asc | |
| 18 | +| book/02-git-basics/sections/tagging.asc | |
| 19 | +| book/02-git-basics/sections/undoing.asc | |
| 20 | +| book/02-git-basics/sections/viewing-history.asc | |
| 21 | +| book/03-git-branching/sections/basic-branching-and-merging.asc | |
| 22 | +| book/03-git-branching/sections/branch-management.asc | |
| 23 | +| book/03-git-branching/sections/nutshell.asc | |
| 24 | +| book/03-git-branching/sections/rebasing.asc | |
| 25 | +| book/03-git-branching/sections/remote-branches.asc | |
| 26 | +| book/03-git-branching/sections/workflows.asc | |
| 27 | +| book/04-git-server/sections/generating-ssh-key.asc | |
| 28 | +| book/04-git-server/sections/git-daemon.asc | |
| 29 | +| book/04-git-server/sections/gitlab.asc | |
| 30 | +| book/04-git-server/sections/git-on-a-server.asc | |
| 31 | +| book/04-git-server/sections/gitweb.asc | |
| 32 | +| book/04-git-server/sections/hosted.asc | |
| 33 | +| book/04-git-server/sections/protocols.asc | |
| 34 | +| book/04-git-server/sections/setting-up-server.asc | |
| 35 | +| book/04-git-server/sections/smart-http.asc | |
| 36 | +| book/05-distributed-git/sections/contributing.asc | |
| 37 | +| book/05-distributed-git/sections/distributed-workflows.asc | |
| 38 | +| book/05-distributed-git/sections/maintaining.asc | |
| 39 | +| book/06-github/sections/1-setting-up-account.asc | |
| 40 | +| book/06-github/sections/2-contributing.asc | |
| 41 | +| book/06-github/sections/3-maintaining.asc | |
| 42 | +| book/06-github/sections/4-managing-organization.asc | |
| 43 | +| book/06-github/sections/5-scripting.asc | |
| 44 | +| book/07-git-tools/sections/advanced-merging.asc | |
| 45 | +| book/07-git-tools/sections/bundling.asc | |
| 46 | +| book/07-git-tools/sections/credentials.asc | |
| 47 | +| book/07-git-tools/sections/debugging.asc | |
| 48 | +| book/07-git-tools/sections/interactive-staging.asc | |
| 49 | +| book/07-git-tools/sections/replace.asc | |
| 50 | +| book/07-git-tools/sections/rerere.asc | |
| 51 | +| book/07-git-tools/sections/reset.asc | |
| 52 | +| book/07-git-tools/sections/revision-selection.asc | |
| 53 | +| book/07-git-tools/sections/rewriting-history.asc | |
| 54 | +| book/07-git-tools/sections/searching.asc | |
| 55 | +| book/07-git-tools/sections/signing.asc | |
| 56 | +| book/07-git-tools/sections/stashing-cleaning.asc | |
| 57 | +| book/07-git-tools/sections/submodules.asc | |
| 58 | +| book/07-git-tools/sections/subtree-merges.asc | |
| 59 | +| book/08-customizing-git/sections/attributes.asc | |
| 60 | +| book/08-customizing-git/sections/config.asc | |
| 61 | +| book/08-customizing-git/sections/hooks.asc | |
| 62 | +| book/08-customizing-git/sections/policy.asc | |
| 63 | +| book/09-git-and-other-scms/sections/client-hg.asc | |
| 64 | +| book/09-git-and-other-scms/sections/client-p4.asc | |
| 65 | +| book/09-git-and-other-scms/sections/client-svn.asc | |
| 66 | +| book/09-git-and-other-scms/sections/import-custom.asc | |
| 67 | +| book/09-git-and-other-scms/sections/import-hg.asc | |
| 68 | +| book/09-git-and-other-scms/sections/import-svn.asc | |
| 69 | +| book/10-git-internals/sections/environment.asc | |
| 70 | +| book/10-git-internals/sections/maintenance.asc | |
| 71 | +| book/10-git-internals/sections/objects.asc | |
| 72 | +| book/10-git-internals/sections/packfiles.asc | |
| 73 | +| book/10-git-internals/sections/plumbing-porcelain.asc | |
| 74 | +| book/10-git-internals/sections/refs.asc | |
| 75 | +| book/10-git-internals/sections/refspec.asc | |
| 76 | +| book/10-git-internals/sections/transfer-protocols.asc | |
| 77 | +| book/A-git-in-other-environments/sections/bash.asc | |
| 78 | +| book/A-git-in-other-environments/sections/guis.asc | |
| 79 | +| book/A-git-in-other-environments/sections/powershell.asc | |
| 80 | +| book/A-git-in-other-environments/sections/visualstudio.asc | |
| 81 | +| book/A-git-in-other-environments/sections/zsh.asc | |
| 82 | +| book/B-embedding-git/sections/jgit.asc | |
| 83 | +| book/B-embedding-git/sections/libgit2.asc | |
| 84 | +| book/contributors.asc | |
| 85 | +| book/dedication.asc | |
| 86 | +| book/introduction.asc | |
| 87 | +| book/preface_ben.asc | |
| 88 | +| book/preface_schacon.asc | |
| 89 | +| C-git-commands.asc | |
| 90 | +| ch02-git-basics-chapter.asc | |
| 91 | +| ch03-git-branching.asc | |
| 92 | +| ch04-git-on-the-server.asc | |
| 93 | +| ch07-git-tools.asc | |
| 94 | +| ch09-git-and-other-systems.asc | |
| 95 | +| CONTRIBUTING.md | |
| 96 | +| LICENSE.asc | |
| 97 | +| progit.asc | |
| 98 | +| README.asc | |
| 99 | +| status.json | |
| 100 | +|=== |
| 101 | + |
| 102 | +Вилучені файли: |
| 103 | + |
| 104 | +* book/A-git-in-other-environments/sections/eclipse.asc |
| 105 | +* book/09-git-and-other-scms/sections/client-tfs.asc |
| 106 | +* .travis.yml |
| 107 | +* book/09-git-and-other-scms/sections/import-tfs.asc |
| 108 | +
|
| 109 | +Додані і нами (для того, щоб генерація працювала), і ними: |
| 110 | +* .github/workflows/pr-build.yml |
| 111 | +* .github/workflows/release-on-merge.yml |
0 commit comments