Compare commits
No commits in common. "gh-pages" and "v0.9" have entirely different histories.
6
.gitattributes
vendored
@ -1,6 +0,0 @@
|
||||
# Set the default behavior, in case people don't have core.autocrlf set.
|
||||
* text eol=lf
|
||||
|
||||
# Denote all files that are truly binary and should not be modified.
|
||||
*.png binary
|
||||
*.psd binary
|
64
.gitignore
vendored
@ -1,64 +0,0 @@
|
||||
.idea/
|
||||
# Text editor backup files
|
||||
*~
|
||||
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
|
||||
# Runtime data
|
||||
pids
|
||||
*.pid
|
||||
*.seed
|
||||
*.pid.lock
|
||||
|
||||
# Directory for instrumented libs generated by jscoverage/JSCover
|
||||
lib-cov
|
||||
|
||||
# Coverage directory used by tools like istanbul
|
||||
coverage
|
||||
|
||||
# nyc test coverage
|
||||
.nyc_output
|
||||
|
||||
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
|
||||
.grunt
|
||||
|
||||
# Bower dependency directory (https://bower.io/)
|
||||
bower_components
|
||||
|
||||
# node-waf configuration
|
||||
.lock-wscript
|
||||
|
||||
# Compiled binary addons (http://nodejs.org/api/addons.html)
|
||||
build/Release
|
||||
|
||||
# Dependency directories
|
||||
node_modules/
|
||||
jspm_packages/
|
||||
|
||||
# Typescript v1 declaration files
|
||||
typings/
|
||||
|
||||
# Optional npm cache directory
|
||||
.npm
|
||||
|
||||
# Optional eslint cache
|
||||
.eslintcache
|
||||
|
||||
# Optional REPL history
|
||||
.node_repl_history
|
||||
|
||||
# Output of 'npm pack'
|
||||
*.tgz
|
||||
|
||||
# Yarn Integrity file
|
||||
.yarn-integrity
|
||||
|
||||
# dotenv environment variables file
|
||||
.env
|
||||
|
||||
|
42
README.md
@ -1,40 +1,31 @@
|
||||
git-flow-cheatsheet
|
||||
===================
|
||||
|
||||
A cheatsheet on the usage of git flow, visit http://danielkummer.github.io/git-flow-cheatsheet/
|
||||
A cheatsheet on the usage of git flow, visit http://danielkummer.github.com/git-flow-cheatsheet/
|
||||
|
||||
GIT FLOW
|
||||
========
|
||||
|
||||
Git extensions to provide high-level repository operations for Vincent Driessen's branching model. [Read more](http://nvie.com/posts/a-successful-git-branching-model/)
|
||||
|
||||
Git extensions to provide high-level repository operations for Vincent
|
||||
Driessen's branching model. — Read more:
|
||||
http://nvie.com/posts/a-successful-git-branching-model/
|
||||
|
||||
INIT:
|
||||
|
||||
```
|
||||
$ git flow init
|
||||
```
|
||||
|
||||
#### TRACK DEVELOP REMOTELY ON GITHUB:
|
||||
|
||||
|
||||
```
|
||||
TRACK DEVELOP REMOTELY ON GITHUB:
|
||||
$ git push origin develop
|
||||
```
|
||||
|
||||
**FEATURES:**
|
||||
|
||||
FEATURES:
|
||||
Use to develop new features starting from the develop branch. Merge back into
|
||||
develop branch waiting for a reasonable amount of features to be there before
|
||||
declaring it a release.
|
||||
|
||||
```
|
||||
$ git flow feature
|
||||
$ git flow feature start <name>
|
||||
$ git flow feature finish <name>
|
||||
```
|
||||
|
||||
```
|
||||
|
||||
|
||||
usage: git flow feature [list] [-v]
|
||||
git flow feature start [-F] <name> [<base>]
|
||||
git flow feature finish [-rFk] <name|nameprefix>
|
||||
@ -44,42 +35,33 @@ usage: git flow feature [list] [-v]
|
||||
git flow feature rebase [-i] [<name|nameprefix>]
|
||||
git flow feature checkout [<name|nameprefix>]
|
||||
git flow feature pull <remote> [<name>]
|
||||
```
|
||||
|
||||
**RELEASES:**
|
||||
|
||||
RELEASES:
|
||||
Use to group together latest development (features) add a few finishing touches
|
||||
if necessary and send to production. All last changes will merge back to master
|
||||
and develop so new features will start from current release.
|
||||
|
||||
```
|
||||
$ git flow release
|
||||
$ git flow release start <release> [<base>]
|
||||
$ git flow release finish <release>
|
||||
```
|
||||
```
|
||||
|
||||
usage: git flow release [list] [-v]
|
||||
git flow release start [-F] <version>
|
||||
git flow release finish [-Fsumpk] <version>
|
||||
git flow release publish <name>
|
||||
git flow release track <name>
|
||||
```
|
||||
|
||||
**HOTFIXES:**
|
||||
|
||||
HOTFIXES:
|
||||
Similar to releases but the hotfix branch starts off master to avoid unvoluntary
|
||||
send to production of unwanted features that my be present in branches. The
|
||||
quick fix must be used when an important bug arises in production which must be
|
||||
fixed and can't wait for other features to be ready. It merges back to master
|
||||
and develop.
|
||||
|
||||
```
|
||||
$ git flow hotfix
|
||||
$ git flow hotfix start <release> [<base>]
|
||||
$ git flow hotfix finish <release>
|
||||
```
|
||||
```
|
||||
|
||||
usage: git flow hotfix [list] [-v]
|
||||
git flow hotfix start [-F] <version> [<base>]
|
||||
git flow hotfix finish [-Fsumpk] <version>
|
||||
```
|
||||
|
274
css/print.css
@ -0,0 +1,274 @@
|
||||
/*---------------------------------------- Text */
|
||||
|
||||
body {
|
||||
font-family: Georgia, Times New Roman, Times, serif;
|
||||
font-weight: bold;
|
||||
font-size: 30px;
|
||||
text-align: center;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
header {
|
||||
height: 400px;
|
||||
border-bottom: 1px solid #698b91
|
||||
}
|
||||
|
||||
footer {
|
||||
display: none;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 120px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
font-family: 'Sansita One', cursive;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 80px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
font-family: 'Sansita One', cursive;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 40px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
font-family: 'Sansita One', cursive;
|
||||
}
|
||||
|
||||
p {
|
||||
width: 95%;
|
||||
margin: 20px auto;
|
||||
text-shadow: 0 2px 1px #fff;
|
||||
}
|
||||
|
||||
a, a:visited {
|
||||
font-weight: bold;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
ul {
|
||||
list-style: none;
|
||||
margin-left: 0;
|
||||
padding-left: 1em;
|
||||
text-indent: -1em;
|
||||
text-shadow: 0 2px 1px #fff;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
ul li:before {
|
||||
content: "\2605\a0"
|
||||
}
|
||||
|
||||
/** coding block */
|
||||
blockquote {
|
||||
text-align: left;
|
||||
margin: 10px auto;
|
||||
background: #131420;
|
||||
border-bottom: 2px solid #30334F;
|
||||
border-right: 2px solid #30334F;
|
||||
border-radius: 10px;
|
||||
padding: 5px 20px;
|
||||
|
||||
}
|
||||
|
||||
code {
|
||||
font-style: normal;
|
||||
padding-left: 5px;
|
||||
border-radius: 10px;
|
||||
color: white;
|
||||
padding: 5px 15px;
|
||||
font-family: menlo, monospace;
|
||||
background: #131420;
|
||||
text-shadow: none;
|
||||
font-size: 0.8em;
|
||||
}
|
||||
|
||||
/*---------------------------------------- Images */
|
||||
|
||||
.initialize {
|
||||
background: url("../img/initialize.png") no-repeat scroll center center transparent;
|
||||
height: 300px;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.lines-small {
|
||||
width: 500px;
|
||||
height: 150px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-small.png");
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.lines-small-end {
|
||||
width: 500px;
|
||||
height: 500px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-small.png");
|
||||
position: absolute;
|
||||
|
||||
}
|
||||
|
||||
.lines-big {
|
||||
width: 500px;
|
||||
height: 5620px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-big.png");
|
||||
position: absolute;
|
||||
left: 697px;
|
||||
|
||||
}
|
||||
|
||||
.lines-open {
|
||||
width: 500px;
|
||||
height: 86px;
|
||||
background: url("../img/lines-open.png");
|
||||
}
|
||||
|
||||
.lines-close {
|
||||
width: 500px;
|
||||
height: 86px;
|
||||
background: url("../img/lines-close.png");
|
||||
}
|
||||
|
||||
.hotfix-end, .hotfix-start, .release-end, .release-start, .feature-end, .feature-start {
|
||||
display: inline-block;
|
||||
background-repeat: no-repeat;
|
||||
background-image: url('../img/flow-sprites.png');
|
||||
background-color: rgba(218, 218, 218, 0.78);
|
||||
border: 2px dashed grey;
|
||||
border-radius: 25px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
}
|
||||
|
||||
.feature-publish {
|
||||
display: inline-block;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
background-color: rgba(218, 218, 218, 0.78);
|
||||
border: 2px dashed grey;
|
||||
border-radius: 25px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
|
||||
background-image: url('../img/feature-publish.png');
|
||||
background-position: center;
|
||||
|
||||
}
|
||||
|
||||
.feature-pull {
|
||||
display: inline-block;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
background-color: rgba(218, 218, 218, 0.78);
|
||||
border: 2px dashed grey;
|
||||
border-radius: 25px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
|
||||
background-image: url('../img/feature-pull.png');
|
||||
background-position: center;
|
||||
|
||||
}
|
||||
|
||||
.hotfix-end {
|
||||
background-position: 0px 0px;
|
||||
}
|
||||
|
||||
.hotfix-start {
|
||||
background-position: 0px -370px;
|
||||
}
|
||||
|
||||
.release-end {
|
||||
background-position: 0px -740px;
|
||||
}
|
||||
|
||||
.release-start {
|
||||
background-position: 0px -1110px;
|
||||
}
|
||||
|
||||
.feature-end {
|
||||
background-position: 0px -1480px;
|
||||
}
|
||||
|
||||
.feature-start {
|
||||
background-position: 0px -1850px;
|
||||
}
|
||||
|
||||
/*---------------------------------------- BLOCKS */
|
||||
|
||||
.col-1 {
|
||||
float: left;
|
||||
width: 600px;
|
||||
}
|
||||
|
||||
.col-2 {
|
||||
float: right;
|
||||
width: 500px;
|
||||
margin-left: 30px;
|
||||
}
|
||||
|
||||
#main {
|
||||
margin: 0 auto;
|
||||
position: relative;
|
||||
width: 1200px;
|
||||
}
|
||||
|
||||
.scrollblock {
|
||||
width: 100%;
|
||||
padding-top: 100px;
|
||||
min-height: 450px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.divider, .accent {
|
||||
text-shadow: none;
|
||||
}
|
||||
|
||||
#title {
|
||||
margin: auto;
|
||||
padding-top: 40px;
|
||||
width: 1150px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
}
|
||||
|
||||
#author {
|
||||
width: 640px;
|
||||
position: absolute;
|
||||
top: 180px;
|
||||
right: 15%;
|
||||
font-size: 20px;
|
||||
text-align: right;
|
||||
font-style: italic;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
.twitter-share-button {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#desc {
|
||||
position: absolute;
|
||||
top: 250px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/*---------------------------------------- Github Banner */
|
||||
#banner {
|
||||
display: none;
|
||||
}
|
||||
|
@ -1,6 +0,0 @@
|
||||
body {
|
||||
direction:rtl;
|
||||
}
|
||||
.col-2{
|
||||
direction: ltr;
|
||||
}
|
@ -1,3 +0,0 @@
|
||||
.lines-big {
|
||||
height: 5030px;
|
||||
}
|
141
css/style.css
@ -4,8 +4,9 @@ body {
|
||||
background-color: powderblue;
|
||||
font-family: Georgia, Times New Roman, Times, serif;
|
||||
font-weight: bold;
|
||||
font-size: 20px;
|
||||
font-size: 30px;
|
||||
text-align: center;
|
||||
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
@ -14,7 +15,7 @@ header {
|
||||
box-shadow: 0px 5px 7px #8db7bd;
|
||||
-webkit-box-shadow: 0px 5px 7px #8db7bd;
|
||||
-moz-box-shadow: 0px 5px 7px #8db7bd;
|
||||
/*height: 400px;*/
|
||||
height: 400px;
|
||||
background-color: #8db7bd;
|
||||
border-bottom: 1px solid #698b91
|
||||
}
|
||||
@ -25,11 +26,11 @@ footer {
|
||||
-moz-box-shadow: 0px -5px 7px #8db7bd;
|
||||
background-color: #8db7bd;
|
||||
border-top: 1px solid #698b91;
|
||||
position: relative;
|
||||
position:relative;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 100px;
|
||||
font-size: 120px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
font-family: 'Sansita One', cursive;
|
||||
@ -39,17 +40,16 @@ h1 {
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 60px;
|
||||
font-size: 80px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
margin-bottom: 25px;
|
||||
text-shadow: 0 2px 1px #000;
|
||||
color: #FFB000;
|
||||
font-family: 'Sansita One', cursive;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 34px;
|
||||
font-size: 40px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
color: #D92B00;
|
||||
@ -58,30 +58,12 @@ h3 {
|
||||
}
|
||||
|
||||
p {
|
||||
width: 95%;
|
||||
margin: 20px auto;
|
||||
text-shadow: none;
|
||||
text-shadow: 0 2px 1px #fff;
|
||||
color: #222438;
|
||||
}
|
||||
|
||||
h2 a {
|
||||
text-decoration: none;
|
||||
font-size: 60px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
margin-bottom: 25px;
|
||||
text-shadow: 0 2px 1px #000;
|
||||
color: #FFB000;
|
||||
font-family: 'Sansita One', cursive;
|
||||
}
|
||||
|
||||
h2 a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
h2 a:visited {
|
||||
color: #FFB000;
|
||||
}
|
||||
|
||||
a, a:visited {
|
||||
color: #D92B00;
|
||||
font-weight: bold;
|
||||
@ -93,7 +75,7 @@ ul {
|
||||
margin-left: 0;
|
||||
padding-left: 1em;
|
||||
text-indent: -1em;
|
||||
text-shadow: none;
|
||||
text-shadow: 0 2px 1px #fff;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
@ -110,19 +92,16 @@ blockquote {
|
||||
border-right: 2px solid #30334F;
|
||||
border-radius: 10px;
|
||||
padding: 5px 20px;
|
||||
color: white;
|
||||
font-family: menlo, monospace;
|
||||
word-wrap: break-word;
|
||||
|
||||
}
|
||||
|
||||
code {
|
||||
display: inline-block;
|
||||
font-style: normal;
|
||||
padding-left: 5px;
|
||||
border-radius: 10px;
|
||||
color: white;
|
||||
padding: 5px 15px;
|
||||
|
||||
font-family: menlo, monospace;
|
||||
background: #131420;
|
||||
text-shadow: none;
|
||||
font-size: 0.8em;
|
||||
@ -132,7 +111,7 @@ code {
|
||||
|
||||
.initialize {
|
||||
background: url("../img/initialize.png") no-repeat scroll center center transparent;
|
||||
height: 244px;
|
||||
height: 300px;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
@ -140,48 +119,42 @@ code {
|
||||
}
|
||||
|
||||
.lines-small {
|
||||
width: 300px;
|
||||
width: 500px;
|
||||
height: 150px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-small.png");
|
||||
position: relative;
|
||||
left: 11px;
|
||||
}
|
||||
|
||||
.lines-small-end {
|
||||
width: 300px;
|
||||
height: 950px;
|
||||
width: 500px;
|
||||
height: 500px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-small.png");
|
||||
position: absolute;
|
||||
left: 361px;
|
||||
|
||||
}
|
||||
|
||||
.lines-big {
|
||||
width: 300px;
|
||||
height: 4853px;
|
||||
width: 500px;
|
||||
height: 5620px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-big.png");
|
||||
position: absolute;
|
||||
left: 360px;
|
||||
left: 697px;
|
||||
|
||||
}
|
||||
|
||||
.lines-open {
|
||||
width: 300px;
|
||||
height: 52px;
|
||||
width: 500px;
|
||||
height: 86px;
|
||||
background: url("../img/lines-open.png");
|
||||
position: relative;
|
||||
left: 11px;
|
||||
}
|
||||
|
||||
.lines-close {
|
||||
width: 300px;
|
||||
height: 52px;
|
||||
width: 500px;
|
||||
height: 86px;
|
||||
background: url("../img/lines-close.png");
|
||||
position: relative;
|
||||
left: 11px;
|
||||
}
|
||||
|
||||
.hotfix-end, .hotfix-start, .release-end, .release-start, .feature-end, .feature-start {
|
||||
@ -191,8 +164,8 @@ code {
|
||||
background-color: rgba(173, 215, 223, 0.8);
|
||||
border: 2px dashed #008098;
|
||||
border-radius: 25px;
|
||||
width: 300px;
|
||||
height: 222px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
|
||||
@ -209,15 +182,16 @@ code {
|
||||
background-color: rgba(173, 215, 223, 0.8);
|
||||
border: 2px dashed #008098;
|
||||
border-radius: 25px;
|
||||
width: 300px;
|
||||
height: 120px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
|
||||
|
||||
box-shadow: 5px 5px 7px #8db7bd;
|
||||
-webkit-box-shadow: 5px 5px 7px #8db7bd;
|
||||
-moz-box-shadow: 5px 5px 7px #8db7bd;
|
||||
background-image: url('../img/feature-publish.png');
|
||||
background-position: center;
|
||||
background-position:center;
|
||||
|
||||
}
|
||||
|
||||
@ -228,68 +202,68 @@ code {
|
||||
background-color: rgba(173, 215, 223, 0.8);
|
||||
border: 2px dashed #008098;
|
||||
border-radius: 25px;
|
||||
width: 300px;
|
||||
height: 120px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
margin-left: -21px;
|
||||
|
||||
box-shadow: 5px 5px 7px #8db7bd;
|
||||
-webkit-box-shadow: 5px 5px 7px #8db7bd;
|
||||
-moz-box-shadow: 5px 5px 7px #8db7bd;
|
||||
background-image: url('../img/feature-pull.png');
|
||||
background-position: center;
|
||||
background-position:center;
|
||||
|
||||
}
|
||||
|
||||
|
||||
.hotfix-end {
|
||||
background-position: 0px 0px;
|
||||
}
|
||||
|
||||
.hotfix-start {
|
||||
background-position: 0px -222px;
|
||||
background-position: 0px -370px;
|
||||
}
|
||||
|
||||
.release-end {
|
||||
background-position: 0px -444px;
|
||||
background-position: 0px -740px;
|
||||
}
|
||||
|
||||
.release-start {
|
||||
background-position: 0px -666px;
|
||||
background-position: 0px -1110px;
|
||||
}
|
||||
|
||||
.feature-end {
|
||||
background-position: 0px -888px;
|
||||
background-position: 0px -1480px;
|
||||
}
|
||||
|
||||
.feature-start {
|
||||
background-position: 0px -1110px;
|
||||
background-position: 0px -1850px;
|
||||
}
|
||||
|
||||
/*---------------------------------------- BLOCKS */
|
||||
|
||||
.col-1 {
|
||||
float: left;
|
||||
width: 320px;
|
||||
width: 600px;
|
||||
}
|
||||
|
||||
.col-2 {
|
||||
float: right;
|
||||
width: 320px;
|
||||
width: 500px;
|
||||
margin-left: 30px;
|
||||
}
|
||||
|
||||
#main {
|
||||
margin: 0 auto;
|
||||
position: relative;
|
||||
width: 670px;
|
||||
width: 1200px;
|
||||
}
|
||||
|
||||
.scrollblock {
|
||||
width: 100%;
|
||||
padding-top: 50px;
|
||||
padding-top: 100px;
|
||||
min-height: 450px;
|
||||
position: relative;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.divider, .accent {
|
||||
@ -300,16 +274,18 @@ code {
|
||||
#title {
|
||||
margin: auto;
|
||||
padding-top: 40px;
|
||||
width: 670px;
|
||||
width: 1150px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
}
|
||||
|
||||
#author {
|
||||
width: 80%;
|
||||
top: 230px;
|
||||
width: 640px;
|
||||
position: absolute;
|
||||
top: 180px;
|
||||
right: 15%;
|
||||
font-size: 20px;
|
||||
text-align: center;
|
||||
text-align: right;
|
||||
font-style: italic;
|
||||
color: #D92B00;
|
||||
z-index: 100;
|
||||
@ -322,22 +298,9 @@ code {
|
||||
}
|
||||
|
||||
#desc {
|
||||
top: 300px;
|
||||
width: 90%;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#translations {
|
||||
top: 340px;
|
||||
width: 80%;
|
||||
right: 5%;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#translations .active {
|
||||
text-decoration: none;
|
||||
cursor: default;
|
||||
color: #3a7eff;
|
||||
position: absolute;
|
||||
top: 250px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#disqus_thread {
|
||||
|
@ -1,50 +0,0 @@
|
||||
body, h1, h2, h3, h4, h5, h6, span, a, blockquote {
|
||||
font-family: Vazirmatn,Calibri,sans serif !important;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.rtl {
|
||||
direction: rtl !important;
|
||||
}
|
||||
|
||||
p, h1, h2, h3, li, ul, span {
|
||||
direction: rtl !important;
|
||||
}
|
||||
|
||||
#banner {
|
||||
left: 0;
|
||||
}
|
||||
|
||||
#banner a {
|
||||
display: block;
|
||||
width: 190px;
|
||||
font-size: 14px;
|
||||
font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Vazirmatn, Geneva, "Helvetica Neue", Helvetica, Arial, sans serif;
|
||||
background-color: #333;
|
||||
color: #FFF;
|
||||
word-spacing: 2px;
|
||||
text-decoration: none;
|
||||
padding: 11px 14px 4px 44px;
|
||||
position: relative;
|
||||
left: -27px;
|
||||
top: 128px;
|
||||
text-align: left;
|
||||
-moz-transform-origin: 0 0;
|
||||
-moz-transform: rotate(-45deg);
|
||||
-moz-box-shadow: 1px 1px 5px 1px #666;
|
||||
-webkit-transform-origin: 0 0;
|
||||
-webkit-transform: rotate(-45deg);
|
||||
-webkit-box-shadow: 1px 1px 5px 1px #666;
|
||||
-ms-transform-origin: 0 0;
|
||||
-ms-transform: rotate(-45deg);
|
||||
-ms-box-shadow: 1px 1px 5px 1px #666;
|
||||
transform-origin: 0 0;
|
||||
transform: rotate(-45deg);
|
||||
box-shadow: 1px 1px 5px 1px #666;
|
||||
background-image: linear-gradient(bottom, #000000 3%, #666666 5%, #000000 7%, #000000 93%, #666666 95%, #000000 97%);
|
||||
background-image: -o-linear-gradient(bottom, #000000 3%, #666666 5%, #000000 7%, #000000 93%, #666666 95%, #000000 97%);
|
||||
background-image: -moz-linear-gradient(bottom, #000000 3%, #666666 5%, #000000 7%, #000000 93%, #666666 95%, #000000 97%);
|
||||
background-image: -webkit-linear-gradient(bottom, #000000 3%, #666666 5%, #000000 7%, #000000 93%, #666666 95%, #000000 97%);
|
||||
background-image: -ms-linear-gradient(bottom, #000000 3%, #666666 5%, #000000 7%, #000000 93%, #666666 95%, #000000 97%);
|
||||
background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.03, #000000), color-stop(0.05, #666666), color-stop(0.07, #000000), color-stop(0.93, #000000), color-stop(0.95, #666666), color-stop(0.97, #000000));
|
||||
}
|
@ -1,8 +0,0 @@
|
||||
body {
|
||||
font-family: 'Lora', serif;
|
||||
}
|
||||
|
||||
h1, h2, h3,
|
||||
h1 a, h2 a, h3 a {
|
||||
font-family: 'Baloo Paaji', cursive;
|
||||
}
|
@ -1,7 +0,0 @@
|
||||
h1, h2, h3 {
|
||||
font-family: 'Sansita One', 'Heiti TC', 'Microsoft YaHei', cursive
|
||||
}
|
||||
|
||||
h1 a, h2 a, h3 a {
|
||||
font-family: 'Sansita One', 'Heiti TC', 'Microsoft YaHei', cursive
|
||||
}
|
BIN
img/download.png
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 17 KiB |
BIN
img/feature-end.png
Normal file
After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 11 KiB |
BIN
img/feature-start.png
Normal file
After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 104 KiB After Width: | Height: | Size: 113 KiB |
Before Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 266 B |
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 3.7 KiB |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 227 B |
BIN
img/release-end.png
Normal file
After Width: | Height: | Size: 23 KiB |
BIN
img/release-start.png
Normal file
After Width: | Height: | Size: 14 KiB |
422
index.an_AN.html
@ -1,422 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_gaq.push(['_trackPageview']);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement('script');
|
||||
ga.type = 'text/javascript';
|
||||
ga.async = true;
|
||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
||||
var s = document.getElementsByTagName('script')[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
creau por <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
|
||||
<script>!function (d, s, id) {
|
||||
var js, fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
}(document, "script", "twitter-wjs");</script>
|
||||
</p>
|
||||
<p id="desc">ramificazions efiziens usando git-flow, por <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">traduzions:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="#" class="active" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
<a href="index.an_AN.html" title="Aragonese">Aragonés</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Sobre git-flow</h2>
|
||||
|
||||
<p>
|
||||
git-flow ye un conchunto d'estensions ta git que furnen comandos d'alto libel ta operar repositorios
|
||||
basaus en o modelo de ramificazions de Vincent
|
||||
Driessen.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">más</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Ista fuella de referenzia esplica as operazions basicas de git-flow, os comandos e os suyos efeutos.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Consellos basicos</h2>
|
||||
<ul>
|
||||
<li>Git flow furne una eszelén aduya en a linia de comandos e informazión. Lée con atenzión o que suzede...</li>
|
||||
<li>O clién ta OSX/Windows <a href="http://www.sourcetreeapp.com/">Sourcetree</a> ye una eszelén GUI ta git e tiene suporte ta git-flow
|
||||
</li>
|
||||
<li>- Git-flow funziona basando-se en fusions de ramas (merge). No reorganiza (branch rebase) as ramas de carauteristicas (feature branches).</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Configuración</a></h2>
|
||||
<ul>
|
||||
<li>Un prerequisito ye una instalazión de git en funzionamiento.</li>
|
||||
<li>Git flow funziona en macOS, Linux e Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Amenesterás wget e util-linux ta instalar git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Ta instruzions d'instalazión detalladas, por favor, vesite a <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">wiki de git flow</a>
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Introduzión</a></h2>
|
||||
<p>Git flow ameneste estar inizializau ta poder alterar a configurazión d'o proyeuto.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inizializazión</h3>
|
||||
|
||||
<p>Encomenze a usar git-flow inizializando-lo dende dentro d'un repositorio git existén:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Abrá de contestar cualques preguntas relazionadas con as convenzions de nombres ta las ramas.<br/>
|
||||
Se recomienda fer servir as valors predeterminadas.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">carauteristicas</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Desembolicar carauteristicas ta futuras versions</li>
|
||||
<li>Ye tipico que nomás s'use en os repositorios ta desembolique</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Encomenzar una nueva carauteristica</h3>
|
||||
<p>O desembolique de nuevas carauteristicas parte d'a rama 'develop'.</p>
|
||||
<p>Encomienze una nueva carauteristica fendo servir</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Ista azión creya una nueva rama derivada de 'develop' e cambea a ista, establindo-la como rama de treballo autual.</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Rematar una carauteristica</h3>
|
||||
|
||||
<p>
|
||||
Remata o desembolique d'una carauteristica.
|
||||
Ista azión realiza lo siguién:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Fusiona MYFEATURE en 'develop'</li>
|
||||
<li>Borra a rama MYFEATURE</li>
|
||||
<li>Cambea a la rama 'develop', establindo-la como rama de treballo autual</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publicar una carauteristica</h3>
|
||||
|
||||
<p>
|
||||
Yes treballando de conchunta? <br/>
|
||||
Publica una carauteristica a un servidor remoto para que asinas pueda estar vista por atros.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Obtenendo carauteristicas publicadas</h3>
|
||||
|
||||
<p>
|
||||
Obten una carauteristica publicada por unatro.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>
|
||||
Puez mantener un seguimiento d'os suyos cambeos usando.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow feature track MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Publicar una versión</a/a2></h2>
|
||||
|
||||
<ul>
|
||||
<li>Para una versión ta produzión</li>
|
||||
<li>Permite apaños menors e a preparazión d'os metadatos ta la publicazión</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Encomenzar una publicazión</h3>
|
||||
|
||||
<p>Ta encomenzar una publicazión, usa o comando git flow release. creyará
|
||||
una rama de publicazión derivada d'a rama 'develop'.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>Opzionalmén, puedes usar <code>[BASE]</code> indicando o codigo sha-1 d'o cambeo dende o cual encomenzar a versión de
|
||||
publicazión. O cambeo ha d'estar parte d'a rama 'develop'.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Ye apropiau publicar remotamén a rama de publicazión dimpués de creyar-la ta permitir que atros desembolicadors invíen cambeos ta ista versión. Fe-lo de forma similar a publicar carauteristicas:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>
|
||||
(Puedes establir o seguimiento d'os cambeos d'a publicazión remota utilizando o siguién comando)
|
||||
<p/>
|
||||
<blockquote>
|
||||
git flow release track RELEASE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Concluyir una publicazión</h3>
|
||||
|
||||
<p>Dar tancadura a una publicazión ye un gran trango. Realiza varias azions:</p>
|
||||
<ul>
|
||||
<li>Fusiona a rama d'a publicazión con a rama 'master'</li>
|
||||
<li>Etiqueta o cambeo con o suyo nombre</li>
|
||||
<li>Torna a fusionar a publicazión con a rama 'develop'</li>
|
||||
<li>Borra a rama d'a publicazión</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>
|
||||
No xublides añadir as tags con <code>git push --tags</code>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Revisiones</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>As revisions surten d'a nezesidat d'actuar immediatamén cuan a versión executando-se en produzión se troba en un estau que no deseyamos
|
||||
</li>
|
||||
<li>Puedes ramificar-se dende a versión correspondién etiquetada en a rama 'master' que corresponda a la versión en produzión.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Como atros comandos de git flow, una revisión s'ubre con</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>L'argumento d'a versión determina o nombre d'a revisión. Opzionalmén, puedes adibir un nombre ta la base dende a cuala encomenzar.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Zarra una revisión</h3>
|
||||
|
||||
<p>En zarrar una revisión, ista se fusiona en as ramas 'develop' e 'master'. Luego, o cambeo en 'master' ye etiquetado con o nombre d'a revisión.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Comandos</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Fayenas pendiens</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Aquí no s'han cubierto toz os comandos disponibles, nomás os más importans</li>
|
||||
<li>Agún puedes usar toz os comandos de git normals tal como los conoxes, git-flow nomás ye una ferramienta más que puez adibir a la tuya colezión.
|
||||
</li>
|
||||
<li>A carauteristica 'support' agún ista en fase beta e no se recomienda usar-la</li>
|
||||
<li>Si quieres furnir traduzions, serán bien rezibidas.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comentarios</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement('script');
|
||||
dsq.type = 'text/javascript';
|
||||
dsq.async = true;
|
||||
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
</body>
|
||||
</html>
|
480
index.ar_MA.html
@ -1,480 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ar" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link
|
||||
href="http://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.ar_MA.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner" style="direction: ltr">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet">
|
||||
GitHub فرع في
|
||||
</a>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
طور من طرف <a href="http://twitter.com/0r1g4m14dd1c7"
|
||||
>Daniel Kummer</a
|
||||
>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>تويتر</a
|
||||
>
|
||||
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
كفاءة المتفرعة باستخدام git-flow من قبل
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
الترجمات: <a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="#" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock" dir="rtl">
|
||||
<h2>حول</h2>
|
||||
|
||||
<p>
|
||||
git-flow هي إضافات لـ git لتوفير عمليات متطورة على المستودع لنموذج
|
||||
الفروع لفانسين دريسنز.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>للمزيد</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>هذه المذكرة تشرح أساسيات استعمال عمليات git-flow وتأثيراتها.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>نصائح أساسية</h2>
|
||||
<ul>
|
||||
<li>
|
||||
أوامر ومخرجات الـ git-flow توفر تسهيلات مهمة جدا. إقرأها بعناية لكي
|
||||
تفهم ماذا يحدث...
|
||||
</li>
|
||||
<li>
|
||||
يعتبر تطبيق الـ macOS/Windows
|
||||
<a href="http://www.sourcetreeapp.com/">سورستري</a>
|
||||
واجهة مستخدم ممتازة لـ git الذي يدعم git-flow.
|
||||
</li>
|
||||
<li>
|
||||
Git-flow هي حل مبني على عمليات الدمج. التي لاتترك قاعدة على الفروع
|
||||
الوظيفية.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">التنصيب</a></h2>
|
||||
<ul>
|
||||
<li>تحتاج إلى تنصيب git متوفر كشرط أساسي.</li>
|
||||
<li>Git flow يعمل في كل من macOS، الينوكس والويندوز.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>لينُكس</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>ويندوز (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>ستحتاج إلى wget و util-linux لكي تقوم بتنصيب git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p style="direction: rtl">
|
||||
لتفسير مفصل عن التنصيب زر موقع
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>git flow wiki</a
|
||||
>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started">الشروع في العمل</a>
|
||||
</h2>
|
||||
<p style="direction: rtl">
|
||||
Git flow .يحتاج للتهييئة كي تخصص تنصيب مشروعك
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>التهييئة</h3>
|
||||
|
||||
<p>ابدأ باستعمال git-flow عن طريق التهييئة داخل مستودع git موفر.</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
ستحتاج إلى الإجابة عن بعض الأسئلة المتعلقة بنظام تسمية فروعك.<br />
|
||||
من المستحسن استخدام القيم الافتراضية.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features"> ميزات Features </a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>طور ميزات جديدة للإصدارات القادمة.</li>
|
||||
<li>توجد عادة في مستودع المبرمجين فقط.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>بدء ميزة جديدة</h3>
|
||||
<p>تبدأ عملية برمجة ميزات جديدة انطلاقا من فرع 'develop'.</p>
|
||||
<p>إبدأ عملية برمجة ميزة جديدة بتنفيذ الأمر</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
هذه العملية تصنع فرع ميزة جديد انطلاقا من فرع 'develop' وينتقل إليه.
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>إتمام الميزة</h3>
|
||||
|
||||
<p>إتمام تطوير ميزة. هذه العملية تقوم بتنفيذ ما يلي:</p>
|
||||
<ul>
|
||||
<li>دمج MYFEATURE نحو فرع 'develop'</li>
|
||||
<li>تحذف فرع الميزة.</li>
|
||||
<li>تحول إلى فرع 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>نشر ميزة</h3>
|
||||
|
||||
<p>
|
||||
هل تقوم بتطوير ميزة بالتعاون مع مجموعة مبرمجين؟
|
||||
<br />
|
||||
أنشر الميزة إلى نطاق السيرفر لكي يستطيع بقية المبرمجين استخدامها.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>الحصول على ميزة منشورة</h3>
|
||||
|
||||
<p>الحصول على ميزة منشورة من طرف مستخدم آخر.</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>
|
||||
يمكنك تتبع ميزة على الأصل باستخدام
|
||||
<code> git flow feature track MYFEATURE</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="release" href="#release" style="direction: rtl">
|
||||
اصنع إصدارا Release</a
|
||||
>
|
||||
</h2>
|
||||
|
||||
<ul>
|
||||
<li>دعم إعداد إنتاج اصدار جديد.</li>
|
||||
<li>السماح باصلاحات أخطاء طفيفة وإعداد بيانات وصفية لإصدار.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>إبدأ الإصدار</h3>
|
||||
|
||||
<p>
|
||||
لكي تبدأ إصدارا استخدم أوامر الإصدار لـ git flow. أنشىء فرع إصدار
|
||||
إنطلاقا من فرع 'develop'
|
||||
</p>
|
||||
<blockquote style="direction: ltr">
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>
|
||||
يمكنك اختياريا اضافة التوريد <code>[BASE]</code> ايداع sha-1 hash كي
|
||||
تبدأ من خلالها الإصدار. الإيداع يجب أن يكون في فرع 'develop'
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
من الأفضل نشر فرع الإصدار بعد إنشائه للسماح للمبرمجين بإيداع
|
||||
الإصدار. قم بنفس الشيء للميزات المنشورة باستخدام الأمر:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
يمكنك متابعة الاصدار على السرفر باستخدام <br /><code
|
||||
>git flow release track RELEASE</code
|
||||
>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>إتمام إصدار</h3>
|
||||
|
||||
<p>إتمام إصدار هي من أهم الخطوات في فروع git.</p>
|
||||
<ul>
|
||||
<li>دمج فرع الإصدار نحو فرع 'master'</li>
|
||||
<li>تسمية فرع الإصدار باسمه.</li>
|
||||
<li>رجع دمج فرع الإصدار نحو فرع 'develop'</li>
|
||||
<li>حذف فرع الإصدار</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>لا تنسى دفع مسمياتك بتنفيذ<code>git push --tags</code></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes"> الإصلاحات Hotfixes </a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
تنشأ الإصلاحات من ضرورة العمل فورا على حالة غير مرغوب فيها من نسخة
|
||||
الانتاج الحية.
|
||||
</li>
|
||||
<li>
|
||||
يمكن الاعتماد على تسمية فرع الإنتاج 'master' لإشارة على نسخة الإنتج
|
||||
الحية.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>بدأ إصلاح</h3>
|
||||
|
||||
<p>كمثل أوامر git flow الأخرى تبدأ إصلاح بالأمر:</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
يمثل المعامل VERSION اسم الإصلاح الجديد. اختياريا يمكنك تحديد
|
||||
basename أي إصدار يطبق الإصلاح.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>إنهاء الإصلاح</h3>
|
||||
|
||||
<p>
|
||||
عند الانتهاء من الإصلاح فإنه يتم دمجها نحو develop و master.
|
||||
بالإضافة إلى ذلك يتم تسمية دمج master بنسخة الإصلاح.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">الأوامر</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>الأعمال المعلقة</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>ليست كل الأوامر مذكورة هنا، فقط الأساسية.</li>
|
||||
<li>
|
||||
يمكنك الاستمرار في استخدام git وجميع الأوامر بشكل طبيعي كما عاهدتهم،
|
||||
git flow ليست سوى مجموعة أدوات
|
||||
</li>
|
||||
<li>ميزة "دعم" لا تزال بيتا، لا ينصح باستخدامها.</li>
|
||||
<li>إذا كنت تريد إضافة ترجمة لهذه الوثيقة، سوف أدرجها بكل سرور.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">تعليقات</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Please enable JavaScript to view the
|
||||
<a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comments powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
505
index.az_AZ.html
@ -1,505 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>git-flow soraqçası</title>
|
||||
<link
|
||||
href="http://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">git-flow soraqçası</h1>
|
||||
|
||||
<p id="author">
|
||||
<a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> tərəfindən
|
||||
yaradılıb
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
<a href="http://nvie.com/">Vincent Driessen</a> tərəfindən git-flow
|
||||
vasitəsilə effektiv budaqlanma
|
||||
</p>
|
||||
<p id="translations">
|
||||
translations: <a href="#" class="active" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>Haqqında</h2>
|
||||
|
||||
<p>
|
||||
Git-flow depo üzərində Vincent Driessen'in budaqlanma modeli üzrə
|
||||
yüksək səviyyəli əməliyyatlar aparmaq üçün git əlavələrinin yığınıdır.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>ətraflı</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Bu soraqça git-flow əməliyyatlarının istifadəsinin əsaslarını və
|
||||
effektini göstərir
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Əsas ipucuları</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git-flow möhtəşəm kömək və çıxış imkanı verir. Nə baş verdiyini
|
||||
görmək üçün onu diqqətlə oxuyun ...
|
||||
</li>
|
||||
<li>
|
||||
macOS/Windows kliyenti
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> git üçün
|
||||
mükəmməl qrafik istifadəçi interfeysidir, həmçinin git-flow dəstəyi
|
||||
təqdim edir.
|
||||
</li>
|
||||
<li>
|
||||
Git-flow birləşmə əsaslı həlldir. O xüsusiyyət budaqlarını
|
||||
birləşdirmək üçün rebase istifadə etmir.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Quraşdırılması</a></h2>
|
||||
<ul>
|
||||
<li>Öncədən git'in quraşdırılması, işlək olması şərtdir.</li>
|
||||
<li>Git flow macOS, Linux və Windows-da çalışır</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<span>Debian əsaslı distributivlər</span>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<span>Red Hat əsaslı distributivlər</span>
|
||||
<blockquote>$ yum install gitflow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>Git-flow quraşdırmaq üçün wget və util-linux alətləri lazımdır.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Git-flow'nun detallı quraşdırılma addımları üçün zəhmət olmasa
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>git flow wiki</a
|
||||
>
|
||||
səhifəsinə daxil olun.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started">Başlayarkən</a>
|
||||
</h2>
|
||||
<p>
|
||||
Layihənizin ilkin tənzimlənməsi üçün git-flow'nun başladılması
|
||||
lazımdır.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Başladılma</h3>
|
||||
|
||||
<p>
|
||||
Git-flow'nu mövcud git deponun daxilində başlatmaqla istifadə edin:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Budaqlarınızın adlandırma konvensiyasıyla bağlı bir neçə suala cavab
|
||||
verməli olacaqsınız.<br />
|
||||
Öncədən təyin edilmiş qiymətlər istifadə etmək tövsiyyə olunur.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Xüsusiyyətlər</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Gələcək buraxılışlar üçün yeni xüsusiyyətlər tərtib edin.</li>
|
||||
<li>Adətən yalnız tərtibatçıların deposunda olur.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Yeni xüsusiyyət başladın</h3>
|
||||
<p>Yeni xüsusiyyətlərin tərtibatı 'develop' budağından başlayır.</p>
|
||||
<p>Yeni xüsusiyyətin tərtibatına</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>ilə başlayın</p>
|
||||
<p>
|
||||
Bu əmr 'develop' əsasında yeni xüsusiyyət budağı yaradır və ona
|
||||
qoşulur
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Xüsusiyyəti tamamlayın</h3>
|
||||
|
||||
<p>
|
||||
Xüsusiyyətin tərtibatını tamamlayın. Bu əmr aşağıdakılarını yerinə
|
||||
yetirir:
|
||||
</p>
|
||||
<ul>
|
||||
<li>MYFEATURE budağını 'develop' budağına birləşdirir</li>
|
||||
<li>Xüsusiyyət budağını silir</li>
|
||||
<li>'develop' budağına qoşulur</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Xüsusiyyəti yayımlayın</h3>
|
||||
|
||||
<p>
|
||||
Xüsusiyyəti birlikdə tərtib edirsiniz? <br />
|
||||
Tərtib etdiyiniz xüsusiyyəti kənar serverə yayımlayın ki, digər
|
||||
istifadəçilər ondan yararlana bilsinlər.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Yayımlanmış xüsusiyyətin əldə olunması</h3>
|
||||
|
||||
<p>Digər istifadəçinin yayımladığı xüsusiyyəti əldə edin.</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>
|
||||
Xüsusiyyəti origin deposunda aşağıdakı əmrlə izləyə bilərsiniz
|
||||
<code> git flow feature track MYFEATURE</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Buraxılış yaradın</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Yeni buraxılışa hazırlıqda kömək edir.</li>
|
||||
<li>
|
||||
Kiçik xətaların düzəldilməsinə və buraxılış üçün meta-məlumatların
|
||||
hazırlanmasına imkan verir
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Buraxılışa başlayın</h3>
|
||||
|
||||
<p>
|
||||
Buraxılışa başlamaq üçün git flow release əmrindən istifadə edin. O
|
||||
'develop' budağı əsasında buraxılış budağını yaradır.
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
İstədiyiniz halda <code>[BASE]</code> - kommitin sha-1 heşini
|
||||
verməklə buraxılışa burdan başlaya bilərsiniz. Bu kommit 'develop'
|
||||
budağında olmalıdır.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
Digər tərtibatçıların da buraxılış kommitlərinə imkan yaratmaq üçün,
|
||||
buraxılış budağı yaradıldıqdan dərhal sonra yayımlanması yaxşı
|
||||
olardı. Bunu aşağıdakı əmrlə, xüsusiyyət yayımlanmasına bənzər
|
||||
şəkildə edin:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(Kənar buraxılışları izləmək üçün <br /><code
|
||||
>git flow release track RELEASE</code
|
||||
>
|
||||
əmrindən istifadə edə bilərsiniz)
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Buraxılışı tamamlayın</h3>
|
||||
|
||||
<p>
|
||||
Buraxılışın tamamlanması git budaqlanmsında böyük addımlardan
|
||||
biridir. O aşağıdakıları yerinə yetirir:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Buraxılış budağını 'master' budağına birləşdirir</li>
|
||||
<li>Buraxılışı adına uyğun teqləyir</li>
|
||||
<li>Buraxılış budağı geriyə, 'develop' budağına birləşir</li>
|
||||
<li>Buraxılış budağı silinir</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
<code>git push --tags</code> əmri ilə teqlərinizi göndərməyi
|
||||
unutmayın
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Düzəlişlər</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Düzəliş ehtiyacı məhsulun işlək, hazır versiyasındakı arzuolunmaz
|
||||
halı dərhal aradan qaldırmaq üçün yaranır.
|
||||
</li>
|
||||
<li>
|
||||
Hazır versiyaya uyğun master budağındakı teqdən budaqlana bilər.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Digət git flow əmrləri kimi düzəliş</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>ilə başlayır</p>
|
||||
<p>
|
||||
Versiya arqumenti yeni düzəliş edilmiş buraxılış adını təyin edir.
|
||||
İstədiyiniz halda düzəlişə başlayacağınız BASENAME-kommiti göstərə
|
||||
bilərsiniz.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Düzəlişi tamamlayın</h3>
|
||||
<p>
|
||||
Düzəliş tamamlandığı halda o 'develop' və 'master' budaqlarına
|
||||
birləşir. Əlavə olaraq 'master' budağına birləşmə düzəlişin
|
||||
versiyası ilə teqlənir.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Əmrlər</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Qeyd və qalıqlar</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Bura bütün mövcud əmrlər deyil, ən vacibləri qeyd edilmişdir</li>
|
||||
<li>
|
||||
Siz hələ də git və onun əmrlərini bildiyniz, normal qaydada istifadə
|
||||
edə bilərsiniz, git flow sadəcə alətlər toplusudur
|
||||
</li>
|
||||
<li>
|
||||
'support' imkanı hələ beta versiyasındadır, istifadəsi tövsiyə
|
||||
olunmur
|
||||
</li>
|
||||
<li>
|
||||
Əgər siz tərcümələr təqdim etmək istəsəniz, onları qoşmaqda məmnun
|
||||
olaram
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Şərhlər</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "http://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Please enable JavaScript to view the
|
||||
<a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comments powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
522
index.ca_CA.html
@ -1,522 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ca" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.ca_CA.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
creat per <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
branques eficients usant git-flow, per
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
traduccions:
|
||||
<a href="index.html" class="active" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="#" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>Sobre git-flow</h2>
|
||||
|
||||
<p>
|
||||
git-flow és un conjunt d'extensions de git que proporcionen operacions
|
||||
d'alt nivell sobre repositoris pel model de branques de Vincent
|
||||
Driessen.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>més</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Aquest full de referència ràpida mostra l'ús bàsic i l'efecte de les
|
||||
operacions de git-flow
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Consells bàsics</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git flow proporciona ajuda i sortides excel·lents per la línia de
|
||||
comandes. Llegeix-la amb atenció per veure què està passant...
|
||||
</li>
|
||||
<li>
|
||||
El client per macOS/Windows
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> és una
|
||||
excel·lent interfície gràfica per git i té suport per git-flow
|
||||
</li>
|
||||
<li>
|
||||
Git-flow és una solució basada en merge. No fa rebase de branques de
|
||||
funcionalitat (feature branches).
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Instal·lació</a></h2>
|
||||
<ul>
|
||||
<li>
|
||||
Necessites una instal·lació de git funcionant com a prerrequisit.
|
||||
</li>
|
||||
<li>Git flow funciona a macOS, Linux i Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>Necessites wget i util-linux per instal·lar git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Per instruccions detallades per instal·lar git flow, visita la
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>wiki de git flow</a
|
||||
>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Començant</a></h2>
|
||||
<p>
|
||||
Git flow necessita inicialitzar-se per personalitzar la configuració
|
||||
del teu projecte.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inicialitzar</h3>
|
||||
|
||||
<p>
|
||||
Comença a usar git-flow inicialitzant-lo en un repositori git
|
||||
existent:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Hauràs de contestar unes preguntes respecte les convencions per
|
||||
anomenar les branques.<br />
|
||||
Es recomana usar els valors per defecte.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="features" href="#features">Funcionalitats (features)</a>
|
||||
</h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>
|
||||
Desenvolupa noves funcionalitats per les properes entregues
|
||||
(releases)
|
||||
</li>
|
||||
<li>
|
||||
Normalment només existeixen en els repositoris dels desenvolupadors
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Comença una nova funcionalitat</h3>
|
||||
<p>
|
||||
El desenvolupament de noves funcionalitats comença des de la branca
|
||||
'develop'.
|
||||
</p>
|
||||
<p>Comença a desenvolupar una nova funcionalitat amb</p>
|
||||
<blockquote>git flow feature start LAMEVAFUNCIONALITAT</blockquote>
|
||||
<p>
|
||||
Aquesta acció crea una nova branca de funcionalitat basada en
|
||||
'develop' i la fa activa
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Acaba una funcionalitat</h3>
|
||||
|
||||
<p>
|
||||
Acaba el desenvolupament d'una funcionalitat. Aquesta acció realitza
|
||||
el següent:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Integra LAMEVAFUNCIONALITAT a 'develop'</li>
|
||||
<li>Esborra la branca de funcionalitat</li>
|
||||
<li>Torna a fer activa la branca 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish LAMEVAFUNCIONALITAT</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publica una funcionalitat</h3>
|
||||
|
||||
<p>
|
||||
Estàs desenvolupant una funcionalitat en col·laboració amb altres
|
||||
desenvolupadors? <br />
|
||||
Publica una funcionalitat al servidor remot de manera que hi puguin
|
||||
accedir altres usuaris.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish LAMEVAFUNCIONALITAT</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Obtenint una funcionlitat publicada</h3>
|
||||
|
||||
<p>Obté una funcionalitat publicada per un altre usuari.</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin LAMEVAFUNCIONALITAT
|
||||
</blockquote>
|
||||
|
||||
<p>
|
||||
Pots seguir una funcionalitat a l'origen usant
|
||||
<code> git flow feature track LAMEVAFUNCIONALITAT</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Fes una entrega (release)</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Prepara una nova entrega a producció</li>
|
||||
<li>
|
||||
Permet arreglar petits errors i preparar les meta-dades per
|
||||
l'entrega
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Comença una entrega</h3>
|
||||
|
||||
<p>
|
||||
Per començar una entrega, usa la comanda git flow release. Crea una
|
||||
branca d'entrega des de la branca 'develop'.
|
||||
</p>
|
||||
<blockquote>git flow release start ENTREGA [BASE]</blockquote>
|
||||
<p>
|
||||
Pots proporcionar de manera opcional un hash sha-1 d'un commit
|
||||
<code>[BASE]</code> des del qual començar l'entrega. El commit ha
|
||||
d'estar a la branca 'develop'.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
És aconsellable publicar la branca d'entrega després de crear-la per
|
||||
tal que altres desenvolupadors puguin començar a fer-hi commits. Tal
|
||||
com per publicar funcionalitats, amb la comanda:
|
||||
</p>
|
||||
<blockquote>git flow release publish ENTREGA</blockquote>
|
||||
<p>
|
||||
Pots seguir una entrega en remot amb la comanda <br /><code
|
||||
>git flow release track ENTREGA</code
|
||||
>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Acaba una entrega</h3>
|
||||
|
||||
<p>
|
||||
Acabar una entrega és un dels grans passos en la gestió de branques
|
||||
amb git. Realitza les següents accions:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Integra la branca d'entrega a 'master'</li>
|
||||
<li>Etiqueta l'entrega amb el seu nom</li>
|
||||
<li>Reintegra l'entrega a 'develop'</li>
|
||||
<li>Esborra la branca d'entrega</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish ENTREGA</blockquote>
|
||||
<p>No oblidis pujar les etiquetes amb <code>git push --tags</code></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="hotfixes" href="#hotfixes">Errors a producció (hotfixes)</a>
|
||||
</h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
A vegades cal actuar inmediatament davant un estat no desitjat de la
|
||||
versió de producció i fer un hotfix
|
||||
</li>
|
||||
<li>
|
||||
Es pot crear una branca des de l'etiqueta corresponent a la branca
|
||||
'master' que marqui la versió a producció.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Com les altres comandes de git flow, un hotfix s'inicia amb</p>
|
||||
<blockquote>git flow hotfix start VERSIÓ [NOMBASE]</blockquote>
|
||||
<p>
|
||||
El paràmetre de la versió marca el nom de la nova entrega.
|
||||
Opcionalment pots especificar un nom base a partir del qual
|
||||
començar.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Acaba un hotfix</h3>
|
||||
|
||||
<p>
|
||||
En acabar un hotfix, els canvis s'integren tant a 'develop' com a
|
||||
'master'. Addicionalment, la integració a 'master' s'etiqueta amb la
|
||||
versió del hotfix.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSIÓ</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Comandes</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Tasques pendents</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
No totes les comandes disponibles s'han explicat, només les més
|
||||
importants
|
||||
</li>
|
||||
<li>
|
||||
Pots seguir utilitzant git i totes les seves comandes de la mateixa
|
||||
manera que fins ara, git flow només és un conjunt d'eines
|
||||
</li>
|
||||
<li>
|
||||
La funcionalitat 'support' encara està en fase beta, no s'aconsella
|
||||
usar-la
|
||||
</li>
|
||||
<li>
|
||||
Si vols ajudar en la traducció,
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>endavant!</a
|
||||
>
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comentaris</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Please enable JavaScript to view the
|
||||
<a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comments powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
525
index.de_DE.html
@ -1,525 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">git-flow Spickzettel</h1>
|
||||
|
||||
<p id="author">
|
||||
erstellt von
|
||||
<a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
Effizientes Branching mittels git-flow von
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
Übersetzungen: <a href="index.html" title="English">English</a> -
|
||||
<a href="index.es_ES.html" title="Spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="#" class="active" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>Über</h2>
|
||||
|
||||
<p>
|
||||
git-flow ist ein Menge von Git-Erweiterungen, welche komplexe
|
||||
Repository-Arbeiten nach Vincent Driessens Branching-Modell
|
||||
ermöglicht.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>mehr</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Dieser Spickzettel veranschaulicht die grundlegende Nutzung und den
|
||||
Ablauf von git-flow Operationen.
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Grundlegende Tipps</h2>
|
||||
<ul>
|
||||
<li>
|
||||
git-flow bietet eine exzellente Hilfe und ausführliche Ausgabe auf
|
||||
der Kommandozeile. Lies Dir die Ausgaben aufmerksam durch und
|
||||
versuche zu verstehen, was passiert.
|
||||
</li>
|
||||
<li>
|
||||
Der macOS/Windows Client
|
||||
<a href="http://www.sourcetreeapp.com/">SourceTree</a> bietet ein
|
||||
exzellentes grafisches Interface und einfache Git-Flow
|
||||
Unterstützung.
|
||||
</li>
|
||||
<li>
|
||||
git-flow ist eine rein Merge-basierte Lösung (Zusammenführung). Es
|
||||
findet kein Rebasing der Feature-Branches (Entwicklungszweige)
|
||||
statt.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Einrichtung</a></h2>
|
||||
<ul>
|
||||
<li>
|
||||
Als Voraussetzung benötigst Du eine funktionierende Git
|
||||
Installation.
|
||||
</li>
|
||||
<li>git-flow läuft unter macOS, Linux und Windows.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>Du benötigst wget und util-linux, um git-flow zu installieren.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Für eine detaillierte git-flow Installationsanleitung besuche bitte
|
||||
das
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>git flow wiki</a
|
||||
>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started">Erste Schritte</a>
|
||||
</h2>
|
||||
<p>
|
||||
git-flow muss initalisiert werden, um das Projektsetup anzupassen.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Initialisierung</h3>
|
||||
|
||||
<p>
|
||||
Fange an mit git-flow zu arbeiten, indem Du es innerhalb eines
|
||||
bestehenden Git-Repository initialisierst:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Dabei musst Du einige Fragen bezüglich der Namenskoventionen Deiner
|
||||
Branches (Entwicklungszweige) beantworten.<br />
|
||||
Es wird empfohlen, die Standardwerte zu verwenden.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Features</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Entwicklung neuer Features für bevorstehende Releases.</li>
|
||||
<li>Wird in der Regel nur in Entwickler-Repositories verwendet.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Entwicklung neuer Features</h3>
|
||||
<p>Neue Features werden vom 'develop'-Branch abgeleitet.</p>
|
||||
<p>Starte die Entwicklung eines neuen Features mittels</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
Dieser Befehl erstellt einen neuen Feature-Branch basierend auf
|
||||
'develop' und wechselt in diesen.
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Fertigstellung eines Features</h3>
|
||||
|
||||
<p>
|
||||
Beende die Entwicklung eines Features. Dies führt zu folgenden
|
||||
Aktionen:
|
||||
</p>
|
||||
<ul>
|
||||
<li>
|
||||
Zusammenführen von MYFEATURE in den 'develop'-Branch
|
||||
(Merge-Prozess)
|
||||
</li>
|
||||
<li>Entfernt den Feature-Branch</li>
|
||||
<li>Wechselt zurück in den 'develop'-Branch</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Veröffentlichen eines Features</h3>
|
||||
|
||||
<p>
|
||||
Entwickelst Du ein Feature in Zusammenarbeit? <br />
|
||||
Veröffentliche Dein Feature auf einem entfernten Server, so dass es
|
||||
auch von anderen verfolgt werden kann.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Holen eines veröffentlichten Features</h3>
|
||||
|
||||
<p>
|
||||
Hole ein Feature, welches von einem anderen Nutzer veröffentlicht
|
||||
wurde.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>Du kannst ein Feature unter Verwendung von</p>
|
||||
<blockquote>git flow feature track MYFEATURE</blockquote>
|
||||
<p>auf 'origin' verfolgen.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Erstelle ein Release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Unterstützt die Fertigstellung einer Produktionsversion.</li>
|
||||
<li>
|
||||
Erlaubt geringfügige Bugfixes und die Erstellung der Metadaten für
|
||||
ein Release
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Beginne ein Release</h3>
|
||||
|
||||
<p>
|
||||
Um ein neues Release zu beginnen, benutze den git flow release
|
||||
Befehl. Mit diesem wird ein Release-Branch vom aktuellen
|
||||
'develop'-Branch erstellt.
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
Du kannst optional einen <code>[BASE]</code> Commit sha-1 Hash
|
||||
bereitstellen, um ein Release von diesem Commit zu starten. Der
|
||||
Commit muss sich im 'develop'-Branch befinden.
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Es ist ratsam, den Release-Branch nach der Erstellung zu
|
||||
veröffentlichen und damit anderen Entwicklern die Möglichkeit für
|
||||
Commits zu geben. Mache es ähnlich wie bei einem Feature-Branch mit
|
||||
dem Befehl:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(Du kannst ein entferntes Remote-Release mittels <br />
|
||||
<code>git flow release track RELEASE</code> verfolgen.)
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Fertigstellung eines Releases</h3>
|
||||
|
||||
<p>
|
||||
Das Beenden eines Releases ist einer der größten Schritte im
|
||||
Git-Branching-Prozess. Es bewirkt folgende Aktionen:
|
||||
</p>
|
||||
<ul>
|
||||
<li>
|
||||
Zusammenführen des Release-Branches zurück in den 'master'-Branch.
|
||||
(Merge-Prozess)
|
||||
</li>
|
||||
<li>Markiert (Tagged) das Release mit seinem Namen</li>
|
||||
<li>
|
||||
Zurückführen des Releases in den 'develop'-Branch (Merge-Prozess)
|
||||
</li>
|
||||
<li>Entfernt den Release-Branch</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
Vergesse nicht Deine Tags mittels <code>git push --tags</code> zu
|
||||
pushen.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Hotfixes sind notwendig, sobald ein unerwünschter Zustand innerhalb
|
||||
einer Live-Produktionsversion eintritt und resultierend daraus
|
||||
sofort gehandelt werden muss.
|
||||
</li>
|
||||
<li>
|
||||
Ein Hotfix kann aus dem entsprechenden Tag des 'master'-Branches,
|
||||
welcher die Produktionsversion markiert, direkt abgezweigt werden.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>
|
||||
Ähnlich wie auch die anderen git-flow Befehle wird ein Hotfix
|
||||
mittels
|
||||
</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
begonnen. Das VERSION-Argument markiert hierbei den neuen
|
||||
Hotfix-Release-Namen. Optional kannst Du auch einen BASENAME
|
||||
spezifizieren.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Fertigstellung eines Hotfixes</h3>
|
||||
|
||||
<p>
|
||||
Mit dem Beenden eines Hotfixes wird dieser in den 'develop'- und
|
||||
'master'-Branch zusammengeführt (Merge). Nebenbei wird der
|
||||
'master'-Branch mit einem Tag, welcher die Hotfix-Version
|
||||
beinhaltet, markiert.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Befehle</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
Nur die wichtigsten aller verfügbaren Befehle sind hier behandelt.
|
||||
</li>
|
||||
<li>
|
||||
Du kannst weiterhin alle Git-Befehle normal nutzen, wie Du es
|
||||
gewohnt bist. Git-flow ist nur eine Werkzeugsammlung.
|
||||
</li>
|
||||
<li>
|
||||
Das 'support' Feature ist noch in der Beta-Phase und die Nutzung
|
||||
nicht empfohlen.
|
||||
</li>
|
||||
<li>
|
||||
Wenn Du Übersetzungen beisteuern möchtest, würde ich mich freuen,
|
||||
diese zu integrieren.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Kommentare</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Bitte aktiviere Javascript um die Kommentare zu sehen.
|
||||
<a href="http://disqus.com/?ref_noscript">Powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>Kommentare powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
555
index.el_GR.html
@ -1,555 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>git-flow Φύλλο αναφοράς</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
_gaq.push(["gr._setAccount", "UA-63807502-1"]);
|
||||
_gaq.push(["gr._trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Διακλάδωσέ με στο GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">git-flow Φύλλο αναφοράς</h1>
|
||||
|
||||
<p id="author">
|
||||
δημιουργήθηκε από τον
|
||||
<a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
αποτελεσματικές διακλαδώσεις χρησιμοποιώντας το git-flow του
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>
|
||||
</p>
|
||||
|
||||
<p id="translations">
|
||||
translations: <a href="#" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" class="active" title="Ελληνικά (Greek)"
|
||||
>Ελληνικά (Greek)</a
|
||||
>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>Σχετικά</h2>
|
||||
|
||||
<p>
|
||||
Το git-flow είναι ένα σύνολο από επεκτάσεις για το git που παρέχουν
|
||||
υψηλού επιπέδου λειτουργίες σε εν- αποθετήρια για το μοντέλο
|
||||
διακλαδώσεων του Vincent Driessen.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>περισσότερα</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Αυτό το φύλλο αναφοράς, παρουσιάζει την βασική χρήση και τα
|
||||
αποτελέσματα των λειτουργιών του git-flow
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Βασικές συμβουλές</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Το Git flow παρέχει εξαιρετική βοήθεια στην γραμμή εντολών και στην
|
||||
έξοδο. Διαβάστε προσεκτικά για να δείτε τι συμβαίνει...
|
||||
</li>
|
||||
<li>
|
||||
Το τερματικό
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> για
|
||||
macOS/Windows είναι ένα εξαιρετικό γραφικό περιβάλλων εργασίας για
|
||||
git και παρέχει υποστήριξη για το git-flow
|
||||
</li>
|
||||
<li>
|
||||
Το Git-flow είναι μια λύση βασισμένη στη συγχώνευση (merge). Δεν
|
||||
αναπροσαρμόζει διακλαδώσεις χαρακτηριστικών.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Εγκατάσταση</a></h2>
|
||||
<ul>
|
||||
<li>
|
||||
Είναι προϋπόθεση να έχετε ήδη εγκατεστημένο το git στον υπολογιστή
|
||||
σας.
|
||||
</li>
|
||||
<li>Το Git flow λειτουργεί σε macOS, Linux και Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>
|
||||
Χρειάζεστε το wget και το util-linux για να εγκαταστήσετε το
|
||||
git-flow.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Για αναλυτικές οδηγίες εγκατάστασης του git flow παρακαλώ
|
||||
επισκεφτείτε το
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>git flow wiki</a
|
||||
>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started">Αρχίζοντας</a>
|
||||
</h2>
|
||||
|
||||
<p>
|
||||
Το Git flow πρέπει να προετοιμαστεί, ώστε να προσαρμόσετε τις
|
||||
ρυθμίσεις του έργου σας.
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Προετοιμασία</h3>
|
||||
|
||||
<p>
|
||||
Αρχίστε να χρησιμοποιείτε το git-flow προετοιμάζοντας το, μέσα σε
|
||||
ένα git εν-αποθετήριο (git repository):
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Θα πρέπει να απαντήσετε μερικές ερωτήσεις σχετικά με τους κανόνες
|
||||
ονοματοδοσίας για τις διακλαδώσεις.<br />
|
||||
Συνιστάται η χρήση των τιμών που προτείνονται.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Χαρακτηριστικά</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Δημιουργήστε νέα χαρακτηριστικά για επερχόμενες εκδόσεις</li>
|
||||
<li>Τυπικά υπάρχει μόνο στα εν-αποθετήρια των προγραμματιστών</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Αρχίστε ένα νέο χαρακτηριστικό</h3>
|
||||
|
||||
<p>
|
||||
Η δημιουργία ενός νέου χαρακτηριστικού αρχίζει (δημιουργείται) από
|
||||
την διακλάδωση 'develop'
|
||||
</p>
|
||||
|
||||
<p>Αρχίστε την δημιουργία νέου χαρακτηριστικού με την εντολή</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
Αυτή η ενέργεια δημιουργεί μια νέα διακλάδωση για νέο χαρακτηριστικό
|
||||
βασισμένη στην διακλάδωση 'develop' και μεταπήδηση στην νέα
|
||||
διακλάδωση
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Ολοκληρώστε την δημιουργία ενός νέου χαρακτηριστικού.</h3>
|
||||
|
||||
<p>Αυτή η ενέργεια κάνει τα ακόλουθα</p>
|
||||
<ul>
|
||||
<li>Συγχωνεύει το MYFEATURE στο 'develop'</li>
|
||||
<li>
|
||||
Αφαιρεί την διακλάδωση που δημιουργήθηκε για το νέο χαρακτηριστικό
|
||||
</li>
|
||||
<li>Μεταπηδά ξανά στην διακλάδωση 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Δημοσιεύστε ένα χαρακτηριστικό</h3>
|
||||
|
||||
<p>
|
||||
Αναπτύσσετε ένα χαρακτηριστικό της εφαρμογής σας σε συνεργασία με
|
||||
άλλους προγραμματιστές;<br />
|
||||
Δημοσιεύστε το χαρακτηριστικό σας στον απομακρυσμένο server, ώστε να
|
||||
μπορούν οι άλλοι προγραμματιστές να το χρησιμοποιήσουν.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Πάρτε ένα δημοσιευμένο χαρακτηριστικό</h3>
|
||||
|
||||
<p>
|
||||
Πάρτε ένα δημοσιευμένο χαρακτηριστικό από τον απομακρυσμένο server
|
||||
που το δημοσίευσε κάποιος άλλος προγραμματιστής.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>
|
||||
Μπορείτε να παρακολουθείτε ένα χαρακτηριστικό στον απομακρυσμένο
|
||||
server (origin) χρησιμοποιώντας την εντολή<code>
|
||||
git flow feature track MYFEATURE</code
|
||||
>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="release" href="#release">Δημιουργήστε μια νέα έκδοση</a>
|
||||
</h2>
|
||||
|
||||
<ul>
|
||||
<li>Υποστηρίζει την προετοιμασία μια έκδοσης για παραγωγή</li>
|
||||
<li>
|
||||
Επιτρέπει μικρής σημασίας επιδιορθώσεις σφαλμάτων και προετοιμάζει
|
||||
τα μέτα-δεδομένα για την έκδοση
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Αρχίστε μια έκδοση</h3>
|
||||
|
||||
<p>
|
||||
Για να αρχίσετε μια νέα έκδοση, χρησιμοποιήστε την εντολή του git
|
||||
flow, release. Η εντολή αυτή δημιουργεί μια νέα διακλάδωση, από την
|
||||
διακλάδωση 'develop'
|
||||
</p>
|
||||
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
Μπορείτε προαιρετικά να εισάγετε ως <code>[BASE]</code> το sha-1
|
||||
hash ενός commit για να αρχίσετε την νέα έκδοση το συγκεκριμένο
|
||||
commit. Το commit πρέπει να είναι στην διακλάδωση 'develop'.
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Είναι καλό να δημοσιεύσετε την διακλάδωση έκδοσης, μετά την
|
||||
δημιουργία της, ώστε να επιτρέψετε commits έκδοσης από άλλους
|
||||
προγραμματιστές. Μπορείτε να το κάνετε αυτό, με τον ίδιο τρόπο που
|
||||
δημοσιεύεται τα νέα χαρακτηριστικά, με την εντολή:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(Μπορείτε να παρακολουθείτε απομακρυσμένες εκδόσεις με την εντολή
|
||||
<br /><code>git flow release track RELEASE</code>)
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Ολοκληρώνοντας μια νέα έκδοση</h3>
|
||||
|
||||
<p>
|
||||
Η ολοκλήρωση μιας νέας έκδοσης είναι ένα από τα μεγάλα βήματα στις
|
||||
διακλαδώσεις του git γιατί γίνονται πολλές ενέργειες μαζί:
|
||||
</p>
|
||||
<ul>
|
||||
<li>
|
||||
Συγχωνεύει την διακλάδωση της έκδοσης με την διακλάδωση 'master'
|
||||
</li>
|
||||
<li>Βάζει την ετικέτα στην έκδοση με το όνομα της</li>
|
||||
<li>Συγχωνεύει την έκδοση με την διακλάδωση 'develop'</li>
|
||||
<li>Διαγράψει την διακλάδωση της έκδοσης</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
Μην ξεχάσετε να σπρώξετε τις ετικέτες σας με την εντολή
|
||||
<code>git push --tags</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="hotfixes" href="#hotfixes"
|
||||
>Άμεσες επιδιορθώσεις (Hotfixes)</a
|
||||
>
|
||||
</h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Οι άμεσες επιδιορθώσεις προκύπτουν από την ανάγκη της άμεσης
|
||||
επέμβασης σε μια ανεπιθύμητη κατάσταση της τρέχουσας έκδοσης στο
|
||||
λογισμικό παραγωγής.
|
||||
</li>
|
||||
<li>
|
||||
Μπορεί η νέα διακλάδωση να δημιουργηθεί από την αντίστοιχη ετικέτα
|
||||
στην κεντρική (master) διακλάδωση που χαρακτηρίζει την έκδοση
|
||||
παραγωγής.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>
|
||||
Όπως και οι άλλες εντολές του git flow, μία άμεση επιδιόρθωση
|
||||
αρχίζει με
|
||||
</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
Η επιλογή VERSION, χαρακτηρίζει το όνομα της νέας άμεσης
|
||||
επιδιόρθωσης. Προαιρετικά μπορείτε να ορίσετε ένα όνομα βάσης για να
|
||||
αρχίσετε από εκεί.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Ολοκληρώνοντας μία άμεση επιδιόρθωση</h3>
|
||||
|
||||
<p>
|
||||
Με την ολοκλήρωση μιας άμεσης επιδιόρθωσης, η διακλάδωση
|
||||
συγχωνεύεται με την διακλάδωση develop και master. Επιπλέον η
|
||||
κεντρική διακλάδωση (master) αποκτά την ετικέτα του ονόματος της
|
||||
άμεσης επιδιόρθωσης.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Εντολές</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Σημειώσεις</h2>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
Εδώ δεν καλύπτονται όλες οι διαθέσιμες εντολές, αλλά μόνο οι πιο
|
||||
σημαντικές
|
||||
</li>
|
||||
<li>
|
||||
Μπορείτε να συνεχίσετε την χρήση του git και όλες τις εντολές του
|
||||
κανονικά όπως τις γνωρίζετε, το git flow είναι απλά μια συλλογή με
|
||||
εργαλεία.
|
||||
</li>
|
||||
<li>
|
||||
Το χαρακτηριστικό 'support' είναι ακόμα σε κατάσταση beta, δεν σας
|
||||
συμβουλεύουμε να το χρησιμοποιήσετε
|
||||
</li>
|
||||
<li>
|
||||
Αν σας αρέσει να παρέχετε μεταφράσεις, θα είναι χαρά μου να τις
|
||||
ενσωματώσω
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Σχόλια</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "http://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Παρακαλώ ενεργοποιείστε την JavaScript για να δείτε τα
|
||||
<a href="http://disqus.com/?ref_noscript"
|
||||
>σχόλια που υποστηρίζονται από το Disqus.</a
|
||||
>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>τα σχόλια παρέχονται από το <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
502
index.es_ES.html
@ -1,502 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
creado por <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
ramificaciones eficientes usando git-flow, por
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
traducciones: <a href="index.html" title="english">English</a> -
|
||||
<a href="#" class="active" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>Acerca de git-flow</h2>
|
||||
|
||||
<p>
|
||||
git-flow es un conjunto de extensiones para git que proveen comandos
|
||||
de alto nivel para operar repositorios basados en el modelo de
|
||||
ramificaciones de Vincent Driessen.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>más</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Esta hoja de referencia explica las operaciones básicas de
|
||||
git-flow, los comandos y sus efectos.
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Consejos básicos</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git flow provee una excelente ayuda en la línea de comandos y e
|
||||
información. Lée con atención lo que sucede...
|
||||
</li>
|
||||
<li>
|
||||
El cliente para OSX/Windows
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> es una
|
||||
excelente GUI para git y tiene soporte para git-flow
|
||||
</li>
|
||||
<li>
|
||||
- Git-flow funciona basándose en fusiones de ramas (merge). No
|
||||
reorganiza (branch rebase) las ramas de características (feature
|
||||
branches).
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Configuración</a></h2>
|
||||
<ul>
|
||||
<li>Un prerequisito es una instalación de git en funcionamiento.</li>
|
||||
<li>Git flow funciona en macOS, Linux y Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>Necesitarás wget y util-linux para instalar git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Para instrucciones de instalación detalladas, por favor, visite la
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>wiki de git flow</a
|
||||
>
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started">Introducción</a>
|
||||
</h2>
|
||||
<p>
|
||||
Git flow necesita ser inicializado para poder alterar la configuración
|
||||
del proyecto.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inicialización</h3>
|
||||
|
||||
<p>
|
||||
Comience a usar git-flow inicializándolo desde dentro de un
|
||||
repositorio git existente:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Deberá contestar algunas preguntas relacionadas con las convenciones
|
||||
de nombres para las ramas.<br />
|
||||
Se recomienda utilizar los valores predeterminados.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Características</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Desarrollar características para futuras versiones</li>
|
||||
<li>Es típico que sólo se use en los repositorios para desarrollo</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Comenzar una nueva característica</h3>
|
||||
<p>
|
||||
El desarrollo de nuevas características parte de la rama 'develop'.
|
||||
</p>
|
||||
<p>Comienze una nueva característica usando</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
Esta acción crea una nueva rama derivada de 'develop' y cambia a
|
||||
esta, estableciéndola como rama de trabajo actual.
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finalizar una característica</h3>
|
||||
|
||||
<p>
|
||||
Finaliza el desarrollo de una característica. Esta acción realiza lo
|
||||
siguiente:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Fusiona MYFEATURE en 'develop'</li>
|
||||
<li>Borra la rama MYFEATURE</li>
|
||||
<li>
|
||||
Cambia a la rama 'develop', estableciéndola como rama de trabajo
|
||||
actual
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publicar una característica</h3>
|
||||
|
||||
<p>
|
||||
¿Estás trabajando colaborativamente? <br />
|
||||
Publica una característica a un servidor remoto para que así pueda
|
||||
ser vista por otros.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Obteniendo características publicadas</h3>
|
||||
|
||||
<p>Obten una característica publicada por otro.</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>Puedes mantener un seguimiento de sus cambios usando.</p>
|
||||
<blockquote>git flow feature track MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Publicar una versión</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Prepara una versión para producción</li>
|
||||
<li>
|
||||
Permite arreglos menores y la preparación de los metadatos para la
|
||||
publicación
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Comenzar una publicación</h3>
|
||||
|
||||
<p>
|
||||
Para comenzar una publicación, usa el comando git flow release.
|
||||
Creará una rama de publicación derivada de la rama 'develop'.
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
Opcionalmente, puede usar <code>[BASE]</code> indicando el código
|
||||
sha-1 del cambio desde el cual comenzar la versión de publicación.
|
||||
El cambio debe ser parte de la rama 'develop'.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
Es apropiado publicar remotamente la rama de publicación después de
|
||||
crearla para permitir que otros desarrolladores envíen cambios para
|
||||
esta versión. Hazlo de forma similar a publicar características:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(Puede establecer el seguimiento de los cambios de la publicación
|
||||
remota utilizando el siguiente comando)
|
||||
</p>
|
||||
|
||||
<p />
|
||||
<blockquote>git flow release track RELEASE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Concluir una publicación</h3>
|
||||
|
||||
<p>
|
||||
Dar cierre a una publicación es un gran paso. Realiza varias
|
||||
acciones:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Fusiona la rama de la publicación con la rama 'master'</li>
|
||||
<li>Etiqueta el cambio con su nombre</li>
|
||||
<li>Vuelve a fusionar la publicación con la rama 'develop'</li>
|
||||
<li>Borra la rama de la publicación</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>No olvides añadir las tags con <code>git push --tags</code></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Revisiones</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Las revisiones surgen de la necesidad de actuar inmediatamente
|
||||
cuando la versión ejecutándose en producción se encuentra en un
|
||||
estado que no deseamos
|
||||
</li>
|
||||
<li>
|
||||
Puede ramificarse desde la versión correspondiente etiquetada en la
|
||||
rama 'master' que corresponda a la versión en producción.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Como otros comandos de git flow, una revisión se abre con</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
El argumento de la versión determina el nombre de la revisión.
|
||||
Opcionalmente, puede agregar un nombre para la base desde la cual
|
||||
comenzar.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Cierra una revisión</h3>
|
||||
|
||||
<p>
|
||||
Al cerrar una revisión, esta se fusiona en las ramas 'develop' y
|
||||
'master'. Luego, el cambio en 'master' es etiquetado con el nombre
|
||||
de la revisión.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Comandos</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Tareas pendientes</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
Aquí no se han cubierto todos los comandos disponibles, sólo los más
|
||||
importantes
|
||||
</li>
|
||||
<li>
|
||||
Aún puede usar todos los comandos de git normales tal y como los
|
||||
conoces, git-flow sólo es una herramienta más que puedes agregar a
|
||||
tu colección.
|
||||
</li>
|
||||
<li>
|
||||
La característica 'support' aún esta en fase beta y no se recomienda
|
||||
usarla
|
||||
</li>
|
||||
<li>Si quiere proveer traducciones, serán bien recibidas.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comentarios</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "http://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Please enable JavaScript to view the
|
||||
<a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comments powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
519
index.fa_FA.html
@ -1,519 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>راهنمای git-flow</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Vazirmatn"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Vazirmatn"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.fa_FA.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">راهنمای git-flow</h1>
|
||||
|
||||
<p id="author">
|
||||
ایجاد شده توسط
|
||||
<a href="http://twitter.com/0r1g4m14dd1c7"> دانیل کامر </a>
|
||||
<br />
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>
|
||||
حساب تویتر
|
||||
</a>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
شاخهبندی بهینه با git-flow توسط
|
||||
<a href="http://nvie.com/">وینسنت دریسن</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
translations: <a href="#" class="active" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Português Brasileiro"
|
||||
>Português Brasileiro</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.lt_LT.html" title="Lithuanian"
|
||||
>Lietuviškai (Lithuanian)</a
|
||||
>
|
||||
-
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>درباره</h2>
|
||||
|
||||
<p>
|
||||
git-flow مجموعهای از تعمیمهای گیت برای ساده سازی عملیات سطح بالا روی
|
||||
مخازن با مدل شاخهبندی وینسنت دریسن است.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>بیشتر</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
این برگه تقلب، استفادههای پایه و تاثیر عملیات git-flow را نشان
|
||||
میدهد.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>راهنماییهای اولیه</h2>
|
||||
<ul>
|
||||
<li>
|
||||
گیت فلو راهنماییهای خوبی در مورد دستورات و خروجی آنها فراهم
|
||||
میکند. مطالب را با دقت مطالعه کنید تا ببنید چه اتفاقی دارد
|
||||
میافتد...
|
||||
</li>
|
||||
<li>
|
||||
برای کاربران OSX یا ویندوز<a href="http://www.sourcetreeapp.com/">
|
||||
Sourcetree
|
||||
</a>
|
||||
یک ابزار عالی است که محیط گرافیکی دارد و از git-flow پشتیبانی
|
||||
میکند.
|
||||
</li>
|
||||
<li>
|
||||
گیت فلو یک راهکار بر اساس ادغام (merge based) است و شاخههای feature
|
||||
(ویژگی، قابلیت) را بازسازی (rebase) نمیکند.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">نصب و راهاندازی</a></h2>
|
||||
<ul>
|
||||
<li>برای نصب git-flow ابتدا لازم است git روی سیستم شما نصب باشد.</li>
|
||||
<li>گیت فلو، روی OSX، لینوکس و ویندوز قابل استفاده است.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>برای OSX</h3>
|
||||
<span> Homebrew استفاده از ابزار</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports استفاده از ابزار</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>لینوکس</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>ویندوز (ابزار Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>شما دو ابزار wget و util-linux را برای نصب git-flow نیاز دارید.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
برای دانستن جزییات بیشتر در مورد نصب گیت فلو، لطفا از
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>ویکی پیج گیت فلو</a
|
||||
>
|
||||
بازدید کنید.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">شروع کار</a></h2>
|
||||
<p>
|
||||
در ابتدا نیاز است گیت فلو برای اعمال تغییرات روی پروژه شما آغاز
|
||||
(مقداردهی اولیه) شود.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>آغاز</h3>
|
||||
|
||||
<p>
|
||||
استفاده از گیت فلو را با دستور زیر در یک مخزن گیت -که از قبل ایجاد
|
||||
شده و وجود دارد- آغاز کنید.
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
شما باید چندین سوال را برای تعیین نامگذاری شاخههای (branches) خود
|
||||
پاسخ دهید. پیشنهاد میشود از مقادیر پیشفرض برای این کار استفاده
|
||||
کنید.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">ویژگیها</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>برای عرضه بعدی یک ویژگی جدید توسعه دهید!</li>
|
||||
<li>به طور معمول فقط در مخازن توسعهدهندگان موجود هستند!</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>آغاز ایجاد یک ویژگی جدید</h3>
|
||||
<p>توسعه ویژگیهای جدید که از شاخه 'develop' آغاز میشوند!</p>
|
||||
<p>توسعه یک ویژگی جدید را با دستور زیر شروع کنید</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
این دستور بر اساس شاخه 'develop' ویژگی جدیدی را میسازد و به صورت
|
||||
خودکار روی آن جابجا میشود.
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>اتمام ویژگی</h3>
|
||||
<p>
|
||||
توسعه یک ویژگی را به پایان میرساند، این دستور نتایج زیر را خواهد
|
||||
داشت:
|
||||
</p>
|
||||
<ul>
|
||||
<li>MYFEATURE را با شاخه 'develop' ادغام میکند.</li>
|
||||
<li>شاخه ویژگی را حذف میکند.</li>
|
||||
<li>دوباره به شاخهی 'develop' برمیگردد.</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>انتشار یک ویژگی</h3>
|
||||
|
||||
<p>
|
||||
آیا شما در حال توسعهی یک ویژگی در یک پروژه مشارکتی هستید؟ <br />
|
||||
ویژگی را روی ریموت سرور منتشر کنید تا برای سایر اعضا قابل استفاده
|
||||
باشد.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>دریافت ویژگیهای منتشر شده</h3>
|
||||
|
||||
<p>قابلیتی را که عضو دیگری منتشر کرده است را دریافت کنید.</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>
|
||||
شما میتوانید توسعه یک ویژگی رو از مبدا، با دستور زیر، زیر نظر داشته
|
||||
باشید. <code> git flow feature track MYFEATURE</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">ایجاد یک انتشار</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>تهیهی پشتیبان از انتشار محصول جدید</li>
|
||||
<li>
|
||||
اجازه برای رفع باگهای جزئی و آماده کردن متا دیتاها برای انتشار
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>شروع یک انتشار</h3>
|
||||
<p>
|
||||
برای استارت یک انتشار، دستور 'git flow release' را بکار ببرید. این
|
||||
دستور یک شاخه انتشار از روی شاخه 'develop' ایجاد میکند.
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
شما به صورت اختیاری میتوانید به جای <code>[BASE]</code> از کد sha-1
|
||||
یک کامیت (ثبت تغییرات) خود برای استارت انتشار از آنجا استفاده کنید.
|
||||
کامیت باید روی برنج 'develop' باشد.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
بهتر است شاخه انتشار را پس از ایجاد منتشر کنید تا سایر توسعهدهنگان
|
||||
نیز بتوانند روی شاخه انتشار کامیت کنند. مشابه انتشار یک ویژگی با
|
||||
دستور زیر اینکار را انجام دهید:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
شما میتوانید انتشار ریموت را، با دستور زیر، زیر نظر داشته باشید.
|
||||
<code>git flow release track RELEASE</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>اتمام یک انتشار</h3>
|
||||
|
||||
<p>
|
||||
اتمام یک انتشار، بخش بزرگی از برنچینگ و شاخهبندی گیت است، که باعث
|
||||
رخدادهای زیر میشود:
|
||||
</p>
|
||||
<ul>
|
||||
<li>شاخه انتشار را با شاخه 'master' ادغام میکند.</li>
|
||||
<li>انتشار را با نامی که روی آن گذاشته شده، برجسب میزند!</li>
|
||||
<li>همجنین شاخه انتشار را با شاخه 'develop' ادغام میکند.</li>
|
||||
<li>شاخه انتشار را حذف میکند.</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
فراموش نکنید که برجسبهای(تگها) خود را پوش کنید!
|
||||
<code>git push --tags</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">اصلاحات</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
اصلاحیهها از ضرورت تغییر فوری، در یک نسخه محصول درحال اجرا (در
|
||||
دسترس کاربران و عموم)، پس از یک بروز یک وضعیت ناخواسته، حاصل می شود.
|
||||
</li>
|
||||
|
||||
<li>
|
||||
ممکن است شاخهبندی آنها از برجسبی که روی شاخه 'master' برای آن نسخه
|
||||
از محصول وجود دارد، باشد.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>شروع یک اصلاحیه</h3>
|
||||
|
||||
<p>
|
||||
مانند سایر دستورات گیت فلو، اصلاحها هم با دستور زیر شروع میشوند:
|
||||
</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
متغیر ورژن برای نامگذاری انتشار اصلاح، بکار میرود که پیشنهاد
|
||||
میشود از یک نام پایه برای این کار استفاده کنید.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>اتمام یک اصلاح</h3>
|
||||
|
||||
<p>
|
||||
با اتمام یک اصلاح، آن شاخه با شاخههای 'develop' و 'master' ادغام
|
||||
میشود. همچنین ادغام با شاخه 'master' با ورژن اصلاح برجسبگذاری
|
||||
میشود.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">دستورات</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>جمعبندی</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
در این نوشته فقط مهمترین دستورات بررسی شدهاند و همه دستورات تشریح
|
||||
نشدهاند.
|
||||
</li>
|
||||
<li>
|
||||
شما هنوز میتوانید از گیت و تمامی دستورات آن، همانطور که میدانید
|
||||
استفاده کنید، گیت فلو فقط یک مجموعه ابزار است.
|
||||
</li>
|
||||
<li>
|
||||
ویژگی 'support' هنوز در نسخه بتا قرار دارد، استفاده از آن پیشنهاد
|
||||
نمیشود.
|
||||
</li>
|
||||
<li>
|
||||
اگر دوست دارید ترجمه جدیدی ارائه دهید، خوشحال میشوم از آنها
|
||||
استفاده کنم.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">نظرات کاربران</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>لطفا برای نمایش نظرات، جاوا اسکریپت را فعال نمایید
|
||||
<a href="http://disqus.com/?ref_noscript">نظرات، نیرو گرفته از Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comments powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
409
index.fr_FR.html
@ -1,409 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_gaq.push(['_trackPageview']);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement('script');
|
||||
ga.type = 'text/javascript';
|
||||
ga.async = true;
|
||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
||||
var s = document.getElementsByTagName('script')[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
créé par <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
|
||||
<script>!function (d, s, id) {
|
||||
var js, fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
}(document, "script", "twitter-wjs");</script>
|
||||
</p>
|
||||
<p id="desc">modèle de versionnement efficace utilisant git-flow par <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">traductions:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="#" class="active" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>À propos</h2>
|
||||
|
||||
<p>
|
||||
git-flow est un ensemble d'extensions git permettant des opérations de haut niveau sur un dépôt pour appliquer le modèle de branches de Vincent Driessen.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">détails</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Cet aide-mémoire montre l'utilisation et les effets des opérations git-flow</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Conseils de base</h2>
|
||||
<ul>
|
||||
<li>Les commandes et sorties de Git-flow apportent une aide précieuse. Lisez-les attentivement pour comprendre ce qui se passe…</li>
|
||||
<li>Le logiciel pour macOS <a href="http://www.sourcetreeapp.com/">Sourcetree</a> est une excellente interface graphique pour git qui supporte git-flow.
|
||||
</li>
|
||||
<li>Git-flow est une solution basée sur les fusions (merge). Elle n'effectue pas de <em>rebase</em> sur les branches de fonctionnalitées</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Installation</a></h2>
|
||||
<ul>
|
||||
<li>Une installation fonctionnelle de git est requise</li>
|
||||
<li>Git flow fonctionne sur macOS, Linux et Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Vous aurez besoin de wget et de util-linux pour installer git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Pour des instructions détaillées concernant l'installation de git-flow, consultez le
|
||||
<a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">wiki git-flow</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Premiers pas</a></h2>
|
||||
<p>Git flow doit être initialisé afin de personnaliser la configuration de votre projet.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Initialisation</h3>
|
||||
|
||||
<p>Commencez à utiliser git-flow en l'initialisant dans un dépôt git existant :</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Vous devrez répondre à quelques questions concernant les conventions de nommage pour vos branches.<br/>
|
||||
Il est recommandé d'utiliser les valeurs par défaut.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big" style="height:5200px"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Fonctionnalités/Features</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Développe des nouvelles fonctionnalités pour la prochaine version</li>
|
||||
<li>Existe en général uniquement dans les dépôts des développeurs</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Commencer une feature</h3>
|
||||
<p>Le développement d'une fonctionnalité commence à partir de la branche 'develop'</p>
|
||||
<p>Commencer le développement d'une nouvelle fonctionnalité avec :</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Cette commande crée une nouvelle branche de fonctionnalité basée sur 'develop' et passe sur cette branche</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Terminer une fonctionnalité</h3>
|
||||
<p>
|
||||
Termine le développement d'une fonctionnalité.
|
||||
Cette action effectue les opérations suivantes:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Fusionne MYFEATURE dans 'develop'</li>
|
||||
<li>Supprime la branche de fonctionnalité</li>
|
||||
<li>Passe sur la branche 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publier une fonctionnalité</h3>
|
||||
|
||||
<p>
|
||||
Vous développez une fonctionnalité en collaboration? <br/>
|
||||
Publiez une fonctionnalité sur le serveur distant pour qu'elle puisse être utilisée par d'autres utilisateurs.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Récupérer une fonctionnalité publiée</h3>
|
||||
|
||||
<p>
|
||||
Récupérer une fonctionnalité publiée par un autre utilisateur
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>Vous pouvez suivre une fonctionnalité sur le serveur distant en utilisant <code> git flow feature track MYFEATURE</code> </p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Livraison/Release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Prépare la sortie d'une nouvelle version de production</li>
|
||||
<li>Permet les corrections de bugs mineurs et la préparation des métadonnées de la release</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Commencer une livraison</h3>
|
||||
|
||||
<p>Pour commencer une livraison, utilisez la commande git-flow release</p>
|
||||
Créer une branche de livraison basée sur la branche de développement.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>Vous pouvez si besoin ajouter le paramètre <code>[BASE]</code>, correspondant au hash d'un commit à partir duquel commencera la livraison. Ce commit doit faire partie de la branche de développement.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Il est préférable de publier la branche de livraison après l'avoir créée pour permettre aux autres développeurs de commiter dessus. De la même manière que pour les fonctionnalités, utilisez cette commande:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>Vous pouvez suivre une livraison sur le serveur distant en utilisant <br/><code>git flow release track RELEASE</code></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Terminer une livraison</h3>
|
||||
|
||||
<p>Terminer une livraison est une des étapes majeures de cette méthode. Plusieurs actions sont réalisées :</p>
|
||||
<ul>
|
||||
<li>Fusionne la branche de livraison dans la branche 'master'</li>
|
||||
<li>Etiquette (tag) la livraison par son nom</li>
|
||||
<li>Fusionne la livraison dans la branche 'develop'</li>
|
||||
<li>Supprime la branche de livraison</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>N'oubliez pas de pousser vos étiquettes (tags) avec <code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Correctifs/Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Les correctifs sont utiles quand il est nécessaire de corriger immédiatement l'état incorrect de la version en production
|
||||
</li>
|
||||
<li>Ils peuvent se baser sur l'étiquette de la branche 'master' indiquant la version en production.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Commencer un hotfix</h3>
|
||||
|
||||
<p>Comme pour les autres commandes git-flow, un hotfix est commencé par</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASE]
|
||||
</blockquote>
|
||||
<p>Ici, le paramètre VERSION indique le nom de la future release corrective. Vous pouvez si besoin spécifier le paramètre <code>[BASE]</code>, correspondant au hash d'un commit ou au nom d'une branche à partir duquel s'appliquera le hotfix.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Terminer un hotfix</h3>
|
||||
|
||||
<p>En terminant un hotfix, il est fusionné dans les branches 'develop' et 'master'. De plus la fusion vers 'master' est etiquetée par la version du hotfix.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Commandes</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>En complément</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Toutes les commandes disponibles ne sont pas abordées ici, seulement les principales</li>
|
||||
<li>Vous pouvez toujours utiliser normalement git et toutes ses commandes telles que vous les connaissez, git flow est seulement un ensemble d'outils supplémentaires
|
||||
</li>
|
||||
<li>La fonction 'support' est encore en version bêta, il n'est pas conseillé de l'utiliser</li>
|
||||
<li>Si vous voulez ajouter des traductions de ce document, je les intégrerai avec plaisir</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Commentaires</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement('script');
|
||||
dsq.type = 'text/javascript';
|
||||
dsq.async = true;
|
||||
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
488
index.hr_HR.html
@ -1,488 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">git-flow šalabahter</h1>
|
||||
|
||||
<p id="author">
|
||||
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
efikasno branchanje koristeći git-flow
|
||||
<a href="http://nvie.com/">Vincenta Driessena</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
prijevodi: <a href="#" class="active" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.hr_HR.html" title="Croatian">Hrvatski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>O git-flowu</h2>
|
||||
|
||||
<p>
|
||||
git-flow je skup ekstenzija koje omogućuju da se operacije na
|
||||
repozitoriju, koje implementiraju branching model Vincenta Driessena,
|
||||
obavljaju lakše.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>more</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Ovaj šalabahter prikazuje osnovnu uporabu i efekte git-flow operacija
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Osnovni savjeti</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git flow ima izvrsnu pomoć i izlaz na komandnoj liniji. Pažljivo
|
||||
čitajte da vidite što se dešava...
|
||||
</li>
|
||||
<li>
|
||||
macOS/Windows klijent
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> je izvrstan
|
||||
GUI alat za git koji nudi podršku i za git-flow.
|
||||
</li>
|
||||
<li>
|
||||
Git-flow je rješenje zasnovano na mergeovima. Ne vrši se rebase
|
||||
brancheva sa novim razvijenim funkcionalnostima.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Postavljanje</a></h2>
|
||||
<ul>
|
||||
<li>Potrebna je funckcionirajuća git instalacaija.</li>
|
||||
<li>Git flow radni na macOS, Linuxu i Windowsima</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>Trebate wget i util-linux za instaliranje git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Za detaljne instalacijske upute posjetite
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>git flow wiki</a
|
||||
>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Osnove</a></h2>
|
||||
<p>
|
||||
Git flow je potrebno inicijalizirati da prilagodite postavke svog
|
||||
projekta.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inicijalizacija</h3>
|
||||
|
||||
<p>
|
||||
Započnite sa git-flow inicijalizaciranjem istog u postojećem git
|
||||
repozitoriju:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Potrebno je odgovoriti na par pitanja vezano uz konvencije
|
||||
imenovanja brancheva.<br />
|
||||
Preporuča se uporaba pretpostavljenih vrijednosti.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Funkcionalnosti</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Razvoj novih funkcionalnosti za naredne releasove</li>
|
||||
<li>Tipično se nalaze samo u lokalnom repozitoriju</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Početak nove funkcionalnosti</h3>
|
||||
<p>Nove funkcionalnost započinju se iz 'develop' brancha.</p>
|
||||
<p>Otpočnite razvoj nove funkcionalnosti sa:</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
Ova akcija kreira branch za novu funkcionalnost baziran na 'develop'
|
||||
i prebacuje u njega
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Dovršavnje funkcionalnosti</h3>
|
||||
|
||||
<p>
|
||||
Dovršite razvoj nove funkcionalnosti. Ova akcija izvršava slijedeće
|
||||
</p>
|
||||
<ul>
|
||||
<li>Mergea MYFEATURE u 'develop'</li>
|
||||
<li>Uklanja branch funkcionalnosti</li>
|
||||
<li>Prebacuje natrag u 'develop' branch</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publiciranje funkcionalnosti</h3>
|
||||
|
||||
<p>
|
||||
Razvijate li funkcionalnost zajedno s nekim? <br />
|
||||
Publicirajte funkcionalnost na udaljeni server tako da ju mogu
|
||||
koristiti drugi korisnici.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Preuzimanje publicirane funkcionalnosti</h3>
|
||||
|
||||
<p>Preuzmite funkcionalnost koju je netko razvio.</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>
|
||||
Možete pratiti razvoj funkcionalnost sa:
|
||||
<code> git flow feature track MYFEATURE</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Podrška za publiciranje release-a na produkciju</li>
|
||||
<li>
|
||||
Omogućavanje ispravke manjig bugova i pripremu metapodataka za
|
||||
release
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Započnite release</h3>
|
||||
|
||||
<p>
|
||||
Da započnete release, koristite git flow release komandu. Kreira
|
||||
release branch kreiran iz 'develop' branch-a.
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
Opcionalno, možete dati <code>[BASE]</code> sha-1 hash commit-a iz
|
||||
kojeg da se započne release. Commit mora biti na 'develop' branchu.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
Bilo bi pametno publicirati release branch nakon kreiranja da se
|
||||
omoguće release commit-i od ostalih developera. Slično publiciranju
|
||||
funkcionlanosti:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(Možete pratiti udaljeni release sa <br /><code
|
||||
>git flow release track RELEASE</code
|
||||
>
|
||||
komandom)
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Dovršavanje release-a</h3>
|
||||
|
||||
<p>
|
||||
Dovršiti release je veliki korak u git branchanju. Izvršava nekoliko
|
||||
akcija:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Merge-a release branch natrag u 'master'</li>
|
||||
<li>Tagira release sa njegovim nazivom</li>
|
||||
<li>Merge-a release natrag u 'develop'</li>
|
||||
<li>Uklanja release branch</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
Ne zaboravite da pošaljete tagove sa <code>git push --tags</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Brze prepravke</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Kada je potrebno brzinski ispraviti greške na produkciji, koristi se
|
||||
hotfix mogućnost.
|
||||
</li>
|
||||
<li>
|
||||
Može se napraviti branch iz odgovarajućeg taga na master branchu
|
||||
koji označava produkcijsku verziju.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Kao i druge git flow komande, hotfix se započinje sa</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
Argumet 'version' označava naziv hotfix release-a. Dodatno, možete
|
||||
specificirati 'basename' iz kojeg se započinje hotfix.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Dovršavanje hotfixa</h3>
|
||||
|
||||
<p>
|
||||
Dovršavanje, hotfix ibiva merge-an natrag u 'develop' i 'master'.
|
||||
Dodatno, merge u 'master' mbiva tagiran sa verzijom hotfixa.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Komande</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Nisu sve moguće komande, samo one načešće korištene</li>
|
||||
<li>
|
||||
Možete dalje normalno koristiti git i sve njegove komande, git flow
|
||||
je samo kolekcija alata
|
||||
</li>
|
||||
<li>
|
||||
Npr. 'support' mogućnost je još beta, njena se uporaba ne preporuča
|
||||
</li>
|
||||
<li>Pošaljite svoje prijevode, rado ću ih integrirati</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comments</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "http://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Molim, omogućite JavaScript da bi vidjeli
|
||||
<a href="http://disqus.com/?ref_noscript">komentare na Disqusu.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>Komentari putem <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
489
index.html
@ -1,224 +1,130 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen">
|
||||
<link rel="stylesheet" href="css/print.css" type="text/css" media="print">
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_gaq.push(['_trackPageview']);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
var ga = document.createElement('script');
|
||||
ga.type = 'text/javascript';
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
||||
var s = document.getElementsByTagName('script')[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
|
||||
<script>!function (d, s, id) {
|
||||
var js, fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
}(document, "script", "twitter-wjs");</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
efficient branching using git-flow by
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
translations: <a href="#" class="active" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Português Brasileiro"
|
||||
>Português Brasileiro</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.lt_LT.html" title="Lithuanian"
|
||||
>Lietuviškai (Lithuanian)</a
|
||||
>
|
||||
-
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>About</h2>
|
||||
|
||||
<p>
|
||||
git-flow are a set of git extensions to provide high-level repository
|
||||
operations for Vincent Driessen's branching model.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>more</a
|
||||
></small
|
||||
>
|
||||
git-flow are a set of git extensions to provide high-level repository operations for Vincent
|
||||
Driessen's branching model.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
This cheatsheet shows the basic usage and effect of git-flow
|
||||
operations
|
||||
</p>
|
||||
<p>This cheatsheet shows the basic usage and effect of git-flow operations</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="scrollblock">
|
||||
<h2>Basic tips</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git flow provides excellent command line help and output. Read it
|
||||
carefully to see what's happening...
|
||||
</li>
|
||||
<li>
|
||||
The macOS/Windows Client
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an
|
||||
excellent git gui and provides git-flow support
|
||||
</li>
|
||||
<li>
|
||||
Git-flow is a merge based solution. It doesn't rebase feature
|
||||
branches.
|
||||
<li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
|
||||
<li>The OSX Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
|
||||
git-flow support
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock" style="height: 800px;">
|
||||
<h2>Setup</h2>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Setup</a></h2>
|
||||
<ul>
|
||||
<li>You need a working git installation as prerequisite.</li>
|
||||
<li>Git flow works on macOS, Linux and Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>OSX</h3>
|
||||
<blockquote>
|
||||
<code>$ brew install git-flow</code>
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<blockquote>
|
||||
<code>$ apt-get install git-flow</code>
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
<code>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash
|
||||
</code>
|
||||
</blockquote>
|
||||
<p>You need wget and util-linux to install git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
For detailed git flow installation instructions please visit the
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>git flow wiki</a
|
||||
>.
|
||||
You need a working git installation as prerequirement.<br/>
|
||||
For detailed instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Getting started</h2>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started">Getting started</a>
|
||||
</h2>
|
||||
<p>
|
||||
Git flow needs to be initialized in order to customize your project
|
||||
setup.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Initialize</h3>
|
||||
|
||||
<p>Start using git-flow by initializing it inside an existing git repository:</p>
|
||||
<blockquote>
|
||||
<code>
|
||||
git flow init
|
||||
</code>
|
||||
</blockquote>
|
||||
<p>
|
||||
Start using git-flow by initializing it inside an existing git
|
||||
repository:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
You'll have to answer a few questions regarding the naming
|
||||
conventions for your branches.<br />
|
||||
You'll have to answer a few questions regarding the naming conventions for your branches.<br/>
|
||||
It's recommended to use the default values.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
@ -226,26 +132,28 @@
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Features</a></h2>
|
||||
|
||||
<div class="scrollblock" style="height: 600px;">
|
||||
<h2>Features</h2>
|
||||
<ul class="narrow">
|
||||
<li>Develop new features for upcoming releases</li>
|
||||
<li>Typically exist in developers repos only</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Start a new feature</h3>
|
||||
|
||||
<p>Development of new features starting from the 'develop' branch.</p>
|
||||
|
||||
<p>Start developing a new feature with</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
This action creates a new feature branch based on 'develop' and
|
||||
switches to it
|
||||
</p>
|
||||
<blockquote>
|
||||
<code>
|
||||
git-flow feature start MYFEATURE
|
||||
</code>
|
||||
</blockquote>
|
||||
<p>This action creates a new feature branch based on 'develop' and switches to it</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
@ -256,241 +164,220 @@
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finish up a feature</h3>
|
||||
|
||||
<p>
|
||||
Finish the development of a feature. This action performs the
|
||||
following
|
||||
Finish the development of a feature.
|
||||
This action performs the following
|
||||
</p>
|
||||
<ul>
|
||||
<li>Merges MYFEATURE into 'develop'</li>
|
||||
<li>Merged MYFEATURE into 'develop'</li>
|
||||
<li>Removes the feature branch</li>
|
||||
<li>Switches back to 'develop' branch</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
<blockquote>
|
||||
<code>
|
||||
git-flow feature finish MYFEATURE
|
||||
</code>
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publish a feature</h3>
|
||||
|
||||
<p>
|
||||
Are you developing a feature in collaboration? <br />
|
||||
Publish a feature to the remote server so it can be used by other
|
||||
users.
|
||||
Are you developing a feature in collaboration? <br/>
|
||||
Publish a feature to the remote server so it can be used by other users.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
<blockquote>
|
||||
<code>
|
||||
git-flow feature publish MYFEATURE
|
||||
</code>
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Getting a published feature</h3>
|
||||
|
||||
<p>Get a feature published by another user.</p>
|
||||
<p>
|
||||
Get a feature published by another user and track remote changes.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>You can track a feature on origin by using</p>
|
||||
|
||||
<blockquote>git flow feature track MYFEATURE</blockquote>
|
||||
<blockquote>
|
||||
<code>
|
||||
git-flow feature pull MYFEATURE
|
||||
</code>
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Make a release</a></h2>
|
||||
|
||||
<div class="scrollblock" style="height: 900px;">
|
||||
<h2>Make a release</h2>
|
||||
|
||||
<ul>
|
||||
<li>Support preparation of a new production release</li>
|
||||
<li>
|
||||
Allow for minor bug fixes and preparing meta-data for a release
|
||||
</li>
|
||||
<li>Allow for minor bug fixes and preparing meta-data for a release</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Start a release</h3>
|
||||
|
||||
<p>
|
||||
To start a release, use the git flow release command. It creates a
|
||||
release branch created from the 'develop' branch.
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
You can optionally supply a <code>[BASE]</code> commit sha-1 hash to
|
||||
start the release from. The commit must be on the 'develop' branch.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
It's wise to publish the release branch after creating it to allow
|
||||
release commits by other developers. Do it similar to feature
|
||||
publishing with the command:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(You can track a remote release with the <br /><code
|
||||
>git flow release track RELEASE</code
|
||||
>
|
||||
command)
|
||||
<p>To start a release, use the git flow release command. It</p>
|
||||
creates a release branch created from the 'develop' branch.
|
||||
</p>
|
||||
<blockquote>
|
||||
<code>
|
||||
git flow release start RELEASE [BASE]
|
||||
</code>
|
||||
</blockquote>
|
||||
<p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must
|
||||
be on the
|
||||
'develop' branch.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="scrollblock" style="height: 900px;">
|
||||
<div class="col-1">
|
||||
<h3>Finish up a release</h3>
|
||||
|
||||
<p>
|
||||
Finishing a release is one of the big steps in git branching. It
|
||||
performs several actions:
|
||||
</p>
|
||||
<p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
|
||||
<ul>
|
||||
<li>Merges the release branch back into 'master'</li>
|
||||
<li>Tags the release with its name</li>
|
||||
<li>Tags the release with it's name</li>
|
||||
<li>Back-merges the release into 'develop'</li>
|
||||
<li>Removes the release branch</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
Don't forget to push your tags with
|
||||
<code>git push origin --tags</code>
|
||||
</p>
|
||||
<blockquote>
|
||||
<code>
|
||||
git flow release finish RELEASE
|
||||
</code>
|
||||
</blockquote>
|
||||
|
||||
<p>It's wise to publish a finished release after finishing it. Do it similar to feature publishing with the
|
||||
command:</p>
|
||||
<blockquote>
|
||||
<code>
|
||||
git flow release publish RELEASE
|
||||
</code>
|
||||
</blockquote>
|
||||
<p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock" style="height: 800px;">
|
||||
<h2>Hotfixes</h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Hotfixes arise from the necessity to act immediately upon an
|
||||
undesired state of a live production version
|
||||
</li>
|
||||
<li>
|
||||
May be branched off from the corresponding tag on the master branch
|
||||
that marks the production version.
|
||||
<li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
|
||||
</li>
|
||||
<li>May be branched off from the corresponding tag on the master branch that marks the production version.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Like the other git flow commands, a hotfix is started with</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
The version argument hereby marks the new hotfix release name.
|
||||
Optionally you can specify a basename to start from.
|
||||
</p>
|
||||
<blockquote>
|
||||
<code>
|
||||
git flow hotfix start RELEASE
|
||||
</code>
|
||||
</blockquote>
|
||||
<p>The release argument hereby marks the faulty production release</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finish a hotfix</h3>
|
||||
|
||||
<p>
|
||||
By finishing a hotfix it gets merged back into develop and master.
|
||||
Additionally the master merge is tagged with the hotfix version.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
<p>By finishing a hotfix it gets merged back into develp and master. Additionally the master merge ist tagged.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Commands</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
Not all available commands are covered here, only the most important
|
||||
ones
|
||||
</li>
|
||||
<li>
|
||||
You can still use git and all its commands normally as you know
|
||||
them, git flow is only a tooling collection
|
||||
<li>Not all available commands are covered here, only the most important ones</li>
|
||||
<li>You can still use git and all its commands normally as you know them, git flow is only a tooling
|
||||
collection
|
||||
</li>
|
||||
<li>The 'support' feature is still beta, using it is not advised</li>
|
||||
<li>
|
||||
If you'd like to supply translations I'd be happy to integrate them
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comments</a></h2>
|
||||
<h2>Comments</h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
var dsq = document.createElement('script');
|
||||
dsq.type = 'text/javascript';
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Please enable JavaScript to view the
|
||||
<a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comments powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</script>
|
||||
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
545
index.hu_HU.html
@ -1,545 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>git-flow puska</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Forkolj GitHubon</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">git-flow puska</h1>
|
||||
|
||||
<p id="author">
|
||||
készítette <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="author">
|
||||
fordította
|
||||
<a href="https://github.com/andrejmoltok" target="_blank"
|
||||
>Ciocan Pál András</a
|
||||
>
|
||||
</p>
|
||||
<p id="desc">
|
||||
hatékony elágazások git-flow-val
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>-től
|
||||
</p>
|
||||
<p id="translations">
|
||||
translations: <a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Português Brasileiro"
|
||||
>Português Brasileiro</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Hagyományos Kínai)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Egyszerűsített Kínai)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Koreai)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="#" class="active" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Orosz)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (Német)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Katalán)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Román)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Görög)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrán)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnámi)</a>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية(Arab)</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی(Fárszi)</a> -
|
||||
<a href="index.lt_LT.html" title="Lithuanian">Lietuviškai (Litván)</a>
|
||||
-
|
||||
<a href="index.az_AZ.html" title="Polish"
|
||||
>Azərbaycanca (Azerbajdzsáni)</a
|
||||
>
|
||||
-
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>Rólam</h2>
|
||||
|
||||
<p>
|
||||
A git-flow egy git kiterjesztések gyűjteménye, amely magas fokú
|
||||
könyvtár műveleteket nyújt a Vincent Driessen-féle elágazási
|
||||
modellhez.
|
||||
<small
|
||||
><a
|
||||
href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
target="_blank"
|
||||
>tovább</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Ez a puska a git-flow alap műveleteit és ezek következményeit mutatja
|
||||
be.
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Alap tippek</h2>
|
||||
<ul>
|
||||
<li>
|
||||
A git-flow tökéletes parancssori segítséget és kimenetet nyújt.
|
||||
Olvasd figyelmesen hogy lásd mit hogyan kell használni...
|
||||
<small
|
||||
><a href="https://www.npmjs.com/package/gitflow" target="_blank"
|
||||
>tovább</a
|
||||
></small
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
A
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a>, mint
|
||||
macOS/Windows Kliens, illetve a
|
||||
<a
|
||||
href="https://gist.github.com/berkorbay/6feda478a00b0432d13f1fc0a50467f1"
|
||||
>GitHub Desktop for Linux</a
|
||||
>, mint Linux Kliens, mind kiváló git grafikus felület, amely
|
||||
git-flow segédletet biztosíŧ
|
||||
</li>
|
||||
<li>
|
||||
A Git-flow egy merge-alapú megoldás. Viszont, nem képes
|
||||
rebase-elésre.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Telepítés</a></h2>
|
||||
<ul>
|
||||
<li>Előfeltételként szükséges egy működő git telepítés.</li>
|
||||
<li>A Git-flow macOS-on, Linux-on és Windows-on működik.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow</blockquote>
|
||||
<span>Macportolások</span>
|
||||
<blockquote>$ port install git-flow</blockquote>
|
||||
<span
|
||||
><a
|
||||
href="https://github.com/nvie/gitflow/wiki/Mac-OS-X"
|
||||
target="_blank"
|
||||
>tovább</a
|
||||
></span
|
||||
>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ npm i -g gitflow</blockquote>
|
||||
<span
|
||||
><a
|
||||
href="https://github.com/nvie/gitflow/wiki/Linux"
|
||||
target="_blank"
|
||||
>tovább</a
|
||||
></span
|
||||
>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ $ wget -q -O - --no-check-certificate
|
||||
https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh
|
||||
| bash
|
||||
</blockquote>
|
||||
<span
|
||||
><a
|
||||
href="https://github.com/nvie/gitflow/wiki/Windows"
|
||||
target="_blank"
|
||||
>tovább</a
|
||||
></span
|
||||
>
|
||||
<p>
|
||||
Először telepítsd a wget-et, majd az util-linuxot a git-flow-hoz.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Részletes git-flow telepítési útmutatóért látogass el a
|
||||
<a href="https://github.com/nvie/gitflow/wiki">git flow wiki</a>-re.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started">Vágjunk bele</a>
|
||||
</h2>
|
||||
<p>
|
||||
A Git-flow-t először is inicializálni kell hogy személyre szabhasd a
|
||||
projektedet.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inicilizálás</h3>
|
||||
|
||||
<p>
|
||||
Az inicializálást egy, már létező git könyvtárban(repo-ban) kell
|
||||
elkezdeni, az alábbi paranccsal:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Néhány kérdést fog feltenni a branch-eid elnevezési szabványaira
|
||||
való tekintettel.<br />
|
||||
Ajánlott az alap értékekkel menni.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Feature-ök</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Fejlessz új feature-őket a leendő kiadásokhoz</li>
|
||||
<li>Ez jellemzően csak a fejlesztők repo-iban vannak</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Új feature elindítása</h3>
|
||||
<p>Új feature-ok fejlesztése a `develop` branchből indul.</p>
|
||||
<p>A következő parancsot használd ehhez</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
Ez a parancs új feature branch-et készít a `develop`-ba majd
|
||||
automatikusan átvált(checkout) arra a branch-re.
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Új feature befejezése</h3>
|
||||
|
||||
<p>
|
||||
Új feature fejlesztésének befejezése. Ez a parancs a következőket
|
||||
csinálja
|
||||
</p>
|
||||
<ul>
|
||||
<li>Merge-eli a MYFEATURE-t a 'develop' branchbe</li>
|
||||
<li>Eltávolítja a feature branch-et</li>
|
||||
<li>Visszalép a 'develop' branch-be</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Új feature kiadása</h3>
|
||||
|
||||
<p>
|
||||
Csapatban fejlesztessz új feature-t? <br />
|
||||
Publikáld az új feature-t a távoli szerverre, hogy más felhasználók
|
||||
is használni tudják.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Kiadott feature beszerzése</h3>
|
||||
|
||||
<p>Mások által publikált feature-okat így szerezhetsz be.</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>Követheted a feature-t az origin-ből a következőképpen</p>
|
||||
|
||||
<blockquote>git flow feature track MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Kiadás lérehozása</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Támogatja új production release előkészítését</li>
|
||||
<li>
|
||||
Megengedi új kiadásnak(release) bug-fixeit és metadata
|
||||
előkészítését.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Kiadás elindítása</h3>
|
||||
|
||||
<p>
|
||||
Új kiadás(release) létrehozásához, használd a `git flow release`
|
||||
parancsot. Ez készít egy release branch-et, amelyet a `develop`
|
||||
branch-ből ered.
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
Tetszőlgesen csatolhatsz egy <code>[BASE]</code> commit sha-1 hash-t
|
||||
új kiadás elindításához. A megadott commit a `develop` branch-ből
|
||||
kell származnia.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
Bölcs dolog kiadási branch publikálása létrehozás után, mivel más
|
||||
fejlesztők is adhatnak hozzá kiadási commitokat. Hasonlóképpen a
|
||||
feature publikáláshoz, használd az alábbi parancsot:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(Követheted is a távoli kiadás-t ezzel a <br /><code
|
||||
>git flow release track RELEASE</code
|
||||
>
|
||||
paranccsal)
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Kiadás lezárása</h3>
|
||||
|
||||
<p>
|
||||
Egy kiadás lezárása a legnagyobb lépés a git elágazásban. A alábbi
|
||||
parancsok futnak le:
|
||||
</p>
|
||||
<ul>
|
||||
<li>
|
||||
Egyesíti(Merge) a kiadási(release) branch-et a `master` branch-el
|
||||
</li>
|
||||
<li>Hozzáadja a kiadás nevét Tag-ként a kiadáshoz</li>
|
||||
<li>
|
||||
Visszafelé egyesíti a kiadási branch-et a `develop` branch-be
|
||||
</li>
|
||||
<li>Eltávolítja a kiadási(release) branch-et</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
Ne feledd a tag-eket is push-olni
|
||||
<code>git push origin --tags</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixek</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Hotfixekre akkor van szükség, amikor egy nemkívánatos állapot áll
|
||||
fenn egy production verzióban.
|
||||
</li>
|
||||
<li>
|
||||
Elágazhatnak a hozzátartózó tag-ből a master branch-en, amely a
|
||||
production verziót jelőli.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>
|
||||
Hasonlóképpen más git-flow parancsokhoz, egy hotfix elindításához
|
||||
futtasd az alábbi parancsot.
|
||||
</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
A verzió argumentum az új hotfix kiadási nevét jelenti.
|
||||
Tetszőlegesen megjelölhetsz egy kiindulási nevet is.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Hotfix lezárása(finish)</h3>
|
||||
|
||||
<p>
|
||||
Egy hotfix lezárása után, automatikusan egyesítve lesz mind a
|
||||
develop, mind a master banch-ekkel. Továbbá a master branch,
|
||||
egyesítés után, a hotfix verziójával lesz tag-elve.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Parancsok</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
Nincs mindegyik parancs felsorolva itt, csupán a legfontosabbak
|
||||
</li>
|
||||
<li>
|
||||
Továbbra is használhatod a git-et és az összes parancsait, ahogy
|
||||
eddig, a git-flow mindössze a eszköz kollekció.
|
||||
</li>
|
||||
<li>
|
||||
A 'support'(támogatás) feature még beta verzióban van, használata
|
||||
nem ajánlott.
|
||||
</li>
|
||||
<li>Ha a honosításban szeretnél segíteni, akkor forkold GitHubon</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Kommentek</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Please enable JavaScript to view the
|
||||
<a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comments powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
407
index.id_ID.html
@ -1,407 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>Rujukan git-flow</title>
|
||||
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_gaq.push(['_trackPageview']);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement('script');
|
||||
ga.type = 'text/javascript';
|
||||
ga.async = true;
|
||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
||||
var s = document.getElementsByTagName('script')[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">Rujukan <br/>git-flow</h1>
|
||||
|
||||
<p id="author">
|
||||
dibuat oleh: <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
|
||||
<script>!function (d, s, id) {
|
||||
var js, fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
}(document, "script", "twitter-wjs");</script>
|
||||
</p>
|
||||
<p id="desc">menerapkan cabang <i>(branch)</i> yang efisien menggunakan git-flow oleh <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">Terjemahan:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Português Brasileiro">Português Brasileiro</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.lt_LT.html" title="Lithuanian">Lietuviškai (Lithuanian)</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> -
|
||||
<a href="#" class="active" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Tentang git-flow</h2>
|
||||
|
||||
<p>
|
||||
git-flow adalah sebuah ekstensi git untuk menyediakan operasi repositori tingkat tinggi
|
||||
untuk model percabangan <i>(branching model)</i> Vincent Driessen.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">baca lebih lanjut</a></a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Rujukan ini menunjukan dasar penggunaan dan efek dari operasi git-flow</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Tips dasar</h2>
|
||||
<ul>
|
||||
<li>Git flow menyediakan bantuan <i>command line</i> yang sangat baik. Baca perlahan untuk melihat apa yang terjadi</li>
|
||||
<li><a href="http://www.sourcetreeapp.com/">Sourcetree</a> adalah salah satu program yang sangat baik untuk program git berbasis tampilan yang menyediakan dukungan git flow untuk macOS/Windows </li>
|
||||
<li>Git-flow adalah solusi berbasis <i>merge</i>. Ini tidak me-<i>rebase</i> fitur branch.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Setup</a></h2>
|
||||
<ul>
|
||||
<li>Sebagai prasyarat, anda diharuskan memasang/menginstal git</li>
|
||||
<li>Git flow dapat bekerja pada macOS, Linux dan Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Anda membutuhakn wget dan util-linus untuk menginstal git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Untuk detil instruksi pemasangan git flow kunjungi <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Mulai</a></h2>
|
||||
<p>Git flow membutuhkan inisialisasi untuk menyesuaikan dengan proyek anda.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inisialisasi</h3>
|
||||
|
||||
<p>Mulai menggunakan git-flow dengan menginisialisasi dalam repositori git yang sudah ada:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Anda akan diharuskan untuk menjawab beberapa pertanyaan mengenai konvensi nama untuk branch anda.<br/>
|
||||
Sangat direkomendasikan untuk menggunakan nilai bawaan.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Fitur</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Mengembangkan fitur baru untuk rilis selanjutnya</li>
|
||||
<li>Khususnya hanya dalam repositori yang sudah ada sebelumnya</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Mulai sebuah fitur baru</h3>
|
||||
<p>Pengembangan fitur baru dimulai dari <i>branch</i> 'develop'.</p>
|
||||
<p>Mulai pengembangan sebuah fitur baru dengan</p>
|
||||
<blockquote>
|
||||
git flow feature start FITURSAYA
|
||||
</blockquote>
|
||||
<p>Perintah ini membuat sebuah <i>branch</i> fitur baru berdasarkan 'develop' dan beralih ke branch tersebut</p>
|
||||
|
||||
<!--
|
||||
- Benarkan nomor versinya sekarang!
|
||||
- Mulai meng-<i>commit</i> pembenaran di menit-menit akhir dalam persiapan rilis
|
||||
- Ketika selesai, jalankan
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Menyelesaikan sebuah fitur</h3>
|
||||
|
||||
<p>
|
||||
Menyelesaikan pengembangan sebuah fitur.
|
||||
Tindakan ini melakukan hal berikut
|
||||
</p>
|
||||
<ul>
|
||||
<li>Merge FITURSAYA kedalam 'develop'</li>
|
||||
<li>Menghapus <i>branch</i> fitur</li>
|
||||
<li>Beralih kembali ke <i>branch</i> 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish FITURSAYA
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Mempublikasi sebuah Fitur</h3>
|
||||
|
||||
<p>
|
||||
Apakah anda mengembangkan sebuah fitur dalam kolaborasi? <br/>
|
||||
Mempublikasikan sebuah fitur ke dalam server remot agar bisa digunakan oleh pengguna yang lain.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish FITURSAYA
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Mendapatkan sebuah fitur yang telah terpublikasi</h3>
|
||||
|
||||
<p>
|
||||
Mendapatkan sebuah fitur yang telah terpublikasi oleh pengguna lain.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin FITURSAYA
|
||||
</blockquote>
|
||||
|
||||
<p>Anda dapat melacak sebuah fitur bedasarkan asalnya dengan menggunakan <code> git flow feature track FITURSAYA</code> </p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Membuat sebuah rilis</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Mendukung preparasi dari sebuah rilis <i>produksi</i> baru</li>
|
||||
<li>Memperbolehkan untuk pembenaran bug minor dan mempersiapkan meta-data untuk sebuah rilis</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Mulai sebuah rilis</h3>
|
||||
|
||||
<p>Untuk memulai sebuah rilis, gunakan perintah git flow <i>release</i>. Perintah ini akan membuat sebuah <i>branch</i> rilis yang dibuat dari <i>branch</i> 'develop</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>Anda dapat menambahkan opsi sebuah <code>[BASE]</code> commit sha-1 hash untuk memulai rilis dari. <i>Commit</i> harus berada dalam <i>branch</i> 'develop'.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Akan lebih bijak untuk mempublikasi <i>branch</i> rilis setelah membuatnya memperbolehkan merilis <i>commits</i> oleh developer yang lain. Melakukan ini sama dengan mempublikasi fitur dengan perintah:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(Anda dapat melacak sebuah rilis remot dengan perintah <br/><code>git flow release track RELEASE</code>)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Menyelesaikan sebuah rilis</h3>
|
||||
|
||||
<p>Menyelesaikan sebuah rilis adalah sebuah langkah besar dalam git <i>branching</i>. Ini melakukan beberapa tindakan:</p>
|
||||
<ul>
|
||||
<li>Merge <i>branch</i> rilis kembali ke 'master'</li>
|
||||
<li>Menandai (<i>tags</i>) rilis dengan namanya sendiri</li>
|
||||
<li>Merge rilis kembali ke dalam 'develop'</li>
|
||||
<li>Menghapus <i>branch</i> rilis</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>Jangan lupa untuk melakukan <i>push</i> pada penanda (<i>tags</i>) anda dengan <code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Hotfixes muncul dari kebutuhan untuk melakukan tindakan sesegera mungkin atas keadaan yang tidak diinginan pada versi <i>production</i></li>
|
||||
<li>Mungkin percabangan dari penanda (tag) yang sesuai dalam <i>branch</i> master yang ditandai sebagai versi <i>production</i> </li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Seperti perintah git flow yang lain, sebuah <i>hotfix</i> dimulai dengan</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>Argumen versi dengan ini menandai nama sebuah rilis hotfix baru. Dengan opsi anda dapat menspesifikasikan sebuah penamaan dasar untuk memulai.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Menyelesaikan sebuah hotfix</h3>
|
||||
|
||||
<p>Dengan menyelesaikan sebuah <i>hotfix</i> ini berarti akan di-<i>merge</i> kembali ke dalam develop dan master. Sebagai tambahan merge ke master ditandai dengan versi <i>hotfix</i>.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Commands</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><i>Backlog</i></h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Tidak semua perintah yang tersedia dapat mencakup semua, hanya yang paling penting saja</li>
|
||||
<li>Anda masih dapat menggunakan git dan semua perintahnya secara normal seperti yang anda ketahui, git flow adalah hanya sebuah koleksi alat</li>
|
||||
<li>Penyokong fitur masih dalam versi beta, menggunakan ini tidak disarankan</li>
|
||||
<li>Jika anda dapat menyediakan translasi saya akan senang untuk mengintegrasikannya</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Komentar</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement('script');
|
||||
dsq.type = 'text/javascript';
|
||||
dsq.async = true;
|
||||
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Mohon untuk mengaktifkan <i>JavaScript</i> untuk melihat <a href="http://disqus.com/?ref_noscript">komentar didukung oleh Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">komentar didukung oleh <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
515
index.it_IT.html
@ -1,515 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork su GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
creato da <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
branching efficiente usando git-flow realizzato da
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
traduzioni: <a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="#" title="Italiano" class="active">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>Introduzione</h2>
|
||||
|
||||
<p>
|
||||
git-flow è un set di estensioni per git che offre comandi di alto
|
||||
livello sul repository per utilizzare il modello di branching di
|
||||
Vincent Driessen.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>maggiori informazioni</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Questo cheatsheet mostra l'utilizzo di base a gli effetti dei comandi
|
||||
offerti da git-flow
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Consigli di base</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git flow offre un eccelente guida e un ottimo output a linea di
|
||||
comando. Leggeteli attentamente per vedere e capire cosa sta
|
||||
succedendo...
|
||||
</li>
|
||||
<li>
|
||||
Il Client per macOS/Windows
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> è
|
||||
un'eccellente GUI per git e offre supporto per git-flow
|
||||
</li>
|
||||
<li>
|
||||
Git-flow è una soluzione basata sul merge. Non esegue alcun rebase
|
||||
sui feature branch.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Setup</a></h2>
|
||||
<ul>
|
||||
<li>
|
||||
È necessaria un'installazione di git funzionante come prerequisito.
|
||||
</li>
|
||||
<li>Git flow funziona su macOS, Linux e Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>Sono necessari wget e util-linux per installare git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Per le istruzioni dettagliate riguardo all'installazione di git-flow
|
||||
visitate il
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>wiki di git flow</a
|
||||
>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started">Per Iniziare</a>
|
||||
</h2>
|
||||
<p>
|
||||
Git flow ha la necessità di essere inizializzato onde personalizzare
|
||||
il setup del progetto.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inizializzazione</h3>
|
||||
|
||||
<p>
|
||||
è possibile iniziare ad utilizzare git-flow inizializzandolo
|
||||
all'interno di un repository git esistente:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Dovrete rispondere ad alcune domande riguardanti la naming
|
||||
conventions da utilizzarsi per i branch.<br />
|
||||
Si consglia l'uso dei valori di default proposti.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Features (Funzionalità)</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Sviluppare nuove features per le releases in arrivo</li>
|
||||
<li>
|
||||
Generalmente sono (branch) presenti solo nei repository di sviluppo
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Iniziare una nuova feature</h3>
|
||||
<p>Lo sviluppo di nuove feature comincia dal branch 'develop'.</p>
|
||||
<p>Iniziate lo sviluppo di una nuova feature con</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
Questa crea un nuovo feature branch basato su 'develop' e si sposta
|
||||
su quello (ne fa il checkout)
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Completamento di una feature</h3>
|
||||
|
||||
<p>
|
||||
Termina lo sviluppo di una feature. Questa azione esegue le seguenti
|
||||
operazioni
|
||||
</p>
|
||||
<ul>
|
||||
<li>Merge del branch MYFEATURE nel branch 'develop'</li>
|
||||
<li>
|
||||
Rimuove il feature branch usato per lo sviluppo della feature
|
||||
</li>
|
||||
<li>Si sposta di nuovo sul branch 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Pubblicare una feature</h3>
|
||||
|
||||
<p>
|
||||
State sviluppando una feature in collaborazione con altri?<br />
|
||||
Pubblicate una feature sul server remoto in modo che possa essere
|
||||
utilizzata da altri utenti.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Scaricare una feature pubblicata</h3>
|
||||
|
||||
<p>
|
||||
Scaricare dal server remoto una feature pubblicata da un altro
|
||||
utente.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>
|
||||
Potete tracciare una feature sul repository origin usando
|
||||
<code> git flow feature track MYFEATURE</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Creare una release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Supporto alla preparazione di una nuova release di produzione</li>
|
||||
<li>
|
||||
Consente di eseguire bug fixes minori e preparare i meta-dati per la
|
||||
release
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Iniziare una release</h3>
|
||||
|
||||
<p>
|
||||
Per iniziare una release usate il comando release di git flow. Crea
|
||||
un release branch a partire dal branch 'develop'.
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
Potere facoltativamente fornire nel parametro <code>[BASE]</code> lo
|
||||
sha-1 hash del commit dal quale far partire la release. Il commit
|
||||
deve essere presente nel branch 'develop'.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
È una buona idea pubblicare il release branch dopo averlo creato in
|
||||
modo da consentire l'invio di release commit anche da parte di altri
|
||||
sviluppatori. Potete farlo, usando un comando analogo a quello usato
|
||||
per pubblicare le features:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(Potete tracciare la release remota con il comando
|
||||
<code>git flow release track RELEASE</code>)
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Completamento di una release</h3>
|
||||
|
||||
<p>
|
||||
Terminare una release è uno dei passi più grandi nella gestione dei
|
||||
branch di git. Vengono eseguite svariate operazioni:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Merge del release branch su branch 'master'</li>
|
||||
<li>Tagging della relase con il suo nome</li>
|
||||
<li>Merge all'indietro della relase sul branch 'develop'</li>
|
||||
<li>Rimozione del release branch</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
Non dimenticate di fare il push dei tag creati con
|
||||
<code>git push --tags</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Gli Hotfixes nascono dalla necessità di reagire prontamente di
|
||||
fronte ad uno stato indesiderato della versione live di produzione.
|
||||
</li>
|
||||
<li>
|
||||
Possono essere creati a partire dal tag corrispondente sul branch
|
||||
master che contrassegna la versione di produzione.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Come gli altri comandi di git flow, un hotfix si inizia con</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
La versione passata come argomento definisce il nuovo nome
|
||||
dell'hotfix release. Facoltativamente potete specificare un basename
|
||||
da cui partire (un tag di release sul branch 'master').
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>completamento di un hotfix</h3>
|
||||
|
||||
<p>
|
||||
Terminando un hotfix, questo viene integrato (merge) all'indietro
|
||||
all'interno dei branch 'develop' e 'master'. In aggiunta il master
|
||||
viene taggato con la versone dell'hotfix.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Comandi</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
Non tutti i comandi git disponibili sono riportati qui, solo quelli
|
||||
più importanti
|
||||
</li>
|
||||
<li>
|
||||
Potete comunque sempre usare git e tutti i suoi comandi normalmente
|
||||
come li conoscete, git flow costituisce solamente una collezione di
|
||||
strumenti aggiuntivi.
|
||||
</li>
|
||||
<li>
|
||||
La funzionalità 'support' è ancora in beta, il suo utilizzo non è
|
||||
consigliato
|
||||
</li>
|
||||
<li>
|
||||
Se volete fornire una traduzione nella Vostra lingua, sarò felice di
|
||||
integrarla
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Commenti</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Prego abilitare JavaScript per visualizzare i
|
||||
<a href="http://disqus.com/?ref_noscript"
|
||||
>commenti (powered by Disqus.)</a
|
||||
>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comments powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
402
index.ja_JP.html
@ -1,402 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_gaq.push(['_trackPageview']);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement('script');
|
||||
ga.type = 'text/javascript';
|
||||
ga.async = true;
|
||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
||||
var s = document.getElementsByTagName('script')[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
|
||||
<script>!function (d, s, id) {
|
||||
var js, fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
}(document, "script", "twitter-wjs");</script>
|
||||
</p>
|
||||
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">translations:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="#" class="active" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>About</h2>
|
||||
|
||||
<p>
|
||||
git-flowはgitの拡張であり、Vincent Driessenの提唱するブランチモデルを実現するための高度なリポジトリ操作を提供します。
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>このチートシートは基本的な使い方とgit-flowの効果を表します。</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Basic tips</h2>
|
||||
<ul>
|
||||
<li>Git flow は素晴らしいコマンドライン補助と出力を提供します。何が起こるか注意深く読み解いてください。</li>
|
||||
<li>macOS Clientの <a href="http://www.sourcetreeapp.com/">Sourcetree</a> は素晴らしいGUIとgit-flowサポートを提供します。</li>
|
||||
<li>- Git-flow はマージすることをベースとして考えるソリューションです。リベースは行いません。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Setup</a></h2>
|
||||
<ul>
|
||||
<li>前もってgitをインストールしておく必要があります。</li>
|
||||
<li>Git flow はmacOS、Linux、Windowsで動作します。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>git-flowのインストールには、wgetとutil-linuxが必要です。</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
詳細なgit flowのインストール方法は以下のサイトを参考にしてください。 <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Getting started</a></h2>
|
||||
<p>Git flowを開始するには 既存のプロジェクトをカスタマイズします。</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>初期化</h3>
|
||||
|
||||
<p>通常のgitリポジトリ配下に移動した後、下記のコマンドでgit-flow化します。</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
コマンドのあと対話形式で、いくつかの質問に答えます。
|
||||
大体はデフォルトの値が推奨されます。
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Features</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>通常の開発を行います。</li>
|
||||
<li>基本的には開発者のリポジトリのみに行います。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>開発開始</h3>
|
||||
<p>開発用ブランチは 'develop' ブランチから開始します。開始方法は、</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>新たな開発用ブランチを'develop'ブランチをベースとして作成し、開発用ブランチにスイッチします。</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>開発終了</h3>
|
||||
|
||||
<p>
|
||||
開発が終了したらコマンドで以下の操作が行われます。
|
||||
</p>
|
||||
<ul>
|
||||
<li>MYFEATUREブランチを'develop'にマージします。</li>
|
||||
<li>開発用ブランチを削除します。</li>
|
||||
<li>そして、'develop'ブランチにスイッチをします。</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>開発分をリモートへ</h3>
|
||||
|
||||
<p>
|
||||
複数人と同じ開発ブランチで作業するときは、
|
||||
自分の変更分をリモートサーバにプッシュします。
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>修正分を取り込む</h3>
|
||||
|
||||
<p>
|
||||
他の人の修正分を自分のローカルにプルします。
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Make a release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>リリースのための作業を行います。</li>
|
||||
<li>軽微なバグフィックスを行ったり、リリース用のメタデータの準備を行います。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>リリース作業開始</h3>
|
||||
|
||||
<p>リリース作業を開始するには、git flowのreleaseコマンドを使います</p>
|
||||
'develop'ブランチから'release'ブランチを作成します
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p><code>[BASE]</code>はオプションで 'develop'ブランチの特定のCommitのハッシュ値を指定します。指定がない場合はHEADが使われます。</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>'release'ブランチ作成後に修正をプッシュするには、'feature'の時と似たコマンドを使用します:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>('release'リポジトリの修正のトラッキングをすることもできます<br/><code>git flow release track RELEASE</code> )</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>リリース完了</h3>
|
||||
|
||||
<p>リリースの完了は、gitブランチの最大のステップの1つです。このとき、いくつかのアクションが発生します。:</p>
|
||||
<ul>
|
||||
<li>'release'ブランチを'master'にマージします。</li>
|
||||
<li>'master'ブランチにリリース用のタグをつけます。</li>
|
||||
<li>'develop'ブランチに'release'ブランチの内容がマージされます。</li>
|
||||
<li>'release'ブランチが削除されます。</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>すぐに適用しなければいけないような、緊急の場合に使用します。</li>
|
||||
<li>'master'ブランチのタグから、緊急対応用のブランチを作成します。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>緊急対応の開始</h3>
|
||||
|
||||
<p>他のgit flowコマンドと似た形で、hotfixを開始します</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>バージョンの引数は、ホットフィックスリリース名を指定します。 オプションとして開始するベースを指定出来ます。</p>
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>緊急対応の終了</h3>
|
||||
|
||||
<p>緊急対応の終了作業は、'develop'と'master'のブランチをマージします。加えて、'master'ブランチは緊急対応のタグが付けられます。</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Commands</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>コマンドのすべてをカバーしているわけではなく、重要なものだけカバーしています。</li>
|
||||
<li>もちろん、gitのコマンドは通常通りすべて使用することができます。git flowは単にgitのコマンドの集合です。 </li>
|
||||
<li>'support'ブランチの機能はまだベータ版です。それについては言及できません。</li>
|
||||
<li>もし翻訳して頂けるなら、統合してもらえると幸いです。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comments</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement('script');
|
||||
dsq.type = 'text/javascript';
|
||||
dsq.async = true;
|
||||
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
433
index.ko_KR.html
@ -1,433 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
<p id="author">
|
||||
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
efficient branching using git-flow by
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
translations: <a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="#" class="active" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>About</h2>
|
||||
<p>
|
||||
git-flow는 Vincent Driessen의 브랜칭 모델을 위한 고수준 저장소 작업을
|
||||
제공하는 git의 확장입니다.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>more</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
이 치트 시트는 기본적인 사용법과 git-flow 작업의 효과를 보여줍니다.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
<div class="scrollblock">
|
||||
<h2>Basic tips</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git flow는 훌륭한 명령행 도움말과 출력을 제공합니다. 무슨 일이
|
||||
일어나는지를 알려면 출력을 주의깊게 읽어주세요.
|
||||
</li>
|
||||
<li>
|
||||
macOS/Window Client
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a>는 훌륭한 git
|
||||
gui를 제공하고 git-flow에 대한 지원을 제공합니다.
|
||||
</li>
|
||||
<li>
|
||||
Git-flow는 병합(merge) 기반의 솔루션입니다. feature 브랜치를
|
||||
리베이스(rebase)하지 않습니다.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Setup</a></h2>
|
||||
<ul>
|
||||
<li>사전에 제대로 동작하는 git이 설치되어 있어야합니다.</li>
|
||||
<li>Git flow는 macOS, Linux, Windows에서 동작합니다.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>git-flow의 설치를 위해서는 wget과 util-linux가 필요합니다.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
상세한 git flow의 설치 방법은
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>git flow wiki</a
|
||||
>를 참고하세요.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started">Getting started</a>
|
||||
</h2>
|
||||
<p>Git flow는 프로젝트 설정을 변경하기 위해 초기화를 필요로 합니다.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>초기화</h3>
|
||||
<p>
|
||||
기존 git 저장소 내에서 초기화하는 것으로 git-flow의 사용을
|
||||
시작합니다.
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
몇몇 질문에 대답해서 브랜치의 명명규칙을 정합니다. 기본 값을
|
||||
사용하기를 권장합니다.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Features</a></h2>
|
||||
<ul class="narrow">
|
||||
<li>다가오는 배포(release)를 위한 새 기능(feature)을 개발합니다.</li>
|
||||
<li>일반적으로 개발자의 저장소에만 존재합니다.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>새 기능(feature) 시작하기</h3>
|
||||
<p>새 기능의 개발은 'develop' 브랜치에서 시작합니다.</p>
|
||||
<p>다음과 같이 새 기능의 개발을 시작합니다.</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
이것은 'develop'에 기반한 새 기능(feature) 브랜치를 생성하고 그
|
||||
브랜치로 전환합니다.
|
||||
</p>
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>기능 완료</h3>
|
||||
<p>기능 개발을 완료합니다. 이것은 다음 작업들을 수행합니다.</p>
|
||||
<ul>
|
||||
<li>MYFEATURE 브랜치를 'develop'에 병합(merge)합니다.</li>
|
||||
<li>기능 브랜치를 삭제합니다.</li>
|
||||
<li>'develop' 브랜치로 전환합니다.</li>
|
||||
</ul>
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>기능을 게시(publish)</h3>
|
||||
<p>
|
||||
기능을 공동으로 개발하고 있나요? <br />
|
||||
기능을 원격 서버에 게시하여 다른 사용자들도 사용할 수 있게 합니다.
|
||||
</p>
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>게시된 기능 가져오기</h3>
|
||||
<p>다른 사용자가 게시한 기능을 가져옵니다.</p>
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Make a release</a></h2>
|
||||
<ul>
|
||||
<li>새로운 제품 출시 준비를 지원합니다.</li>
|
||||
<li>
|
||||
출시를 위한 사소한 버그 수정이나, 메타 데이터 준비를 허용합니다.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>릴리스 시작</h3>
|
||||
<p>릴리스를 시작하려면 git flow의 release 명령을 사용합니다.</p>
|
||||
<p>'develop' 브랜치로부터 'release' 브랜치를 생성합니다.</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
릴리스를 시작할 <code>[BASE]</code> commit sha-1 해시를 선택적으로
|
||||
줄 수도 있습니다. 그 commit은 반드시 'develop' 브랜치에
|
||||
있어야합니다.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
릴리스 브랜치를 생성한 후에는 다른 개발자들의 릴리스 commit을
|
||||
허용하기위해 게시(publish)하는 것이 현명합니다. 기능 게시와 비슷한
|
||||
방법으로합니다.
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(원격 'release' 브랜치의 변경 추적은 다음과 같이 합니다<br /><code
|
||||
>git flow release track RELEASE</code
|
||||
>
|
||||
)
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>릴리스 완료</h3>
|
||||
<p>
|
||||
릴리스 완료는 git 브랜치하기에서 가장 큰 단계입니다. 몇몇 작업을
|
||||
수행합니다.
|
||||
</p>
|
||||
<ul>
|
||||
<li>'release' 브랜치를 'master' 브랜치에 병합(merge)</li>
|
||||
<li>릴리스를 릴리스 이름으로 태그(tag)</li>
|
||||
<li>릴리스를 'develop' 브랜치로 재병합(back-merge)</li>
|
||||
<li>'release' 브랜치 삭제</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
<code>git push --tags</code>를 사용해 태그들을 push하는 것을
|
||||
잊지마세요.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
<ul>
|
||||
<li>
|
||||
핫픽스는 현재 출시된 제품에 문제가 생겨서 즉각 대응해야하는 상황에서
|
||||
필요합니다.
|
||||
</li>
|
||||
<li>
|
||||
'master' 브랜치의 현재 출시된 버전으로 표기(mark)된 태그(tag)로부터
|
||||
브랜치를 땁니다.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>핫픽스 시작</h3>
|
||||
<p>여타 git flow 명령과 비슷한 방법으로 시작합니다.</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>여기서 버전 인수는 핫픽스 릴리스 이름을 지정합니다.</p>
|
||||
<p>선택적으로 basename으로 시작점을 지정할 수도 있습니다.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>핫픽스 완료</h3>
|
||||
<p>
|
||||
핫픽스를 종료하면 핫픽스는 'develop' 및 'master' 브랜치로
|
||||
병합(merge)됩니다.
|
||||
</p>
|
||||
<p>추가적으로 'master'의 병합 부분은 핫픽스 버전으로 태그됩니다.</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Commands</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
여기서는 모든 명령을 다루지 않았습니다. 중요한 것들만 설명했습니다.
|
||||
</li>
|
||||
<li>
|
||||
git 명령도 사용할 수 있습니다. git flow는 단지 도구 모음일 뿐입니다.
|
||||
</li>
|
||||
<li>
|
||||
'support' 기능은 아직 베타 버전입니다. 사용은 권장되지 않습니다.
|
||||
</li>
|
||||
<li>번역해주신다면 저는 행복하게 통합할 것입니다.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comments</a></h2>
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Please enable JavaScript to view the
|
||||
<a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comments powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
491
index.lt_LT.html
@ -1,491 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>Apie git-flow</title>
|
||||
<link
|
||||
href="http://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">Apie git-flow</h1>
|
||||
|
||||
<p id="author">
|
||||
sukurta <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
efektyvus šakojimas naudojant git-flow, autorius
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
vertimai: <a href="#" class="active" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.lt_LT.html" title="Lithuanian"
|
||||
>Lietuviškai (Lithuanian)</a
|
||||
>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>Apie</h2>
|
||||
|
||||
<p>
|
||||
git-flow yra git plėtinių rinkinys, kuris įgalina aukšto lygio
|
||||
repozitorijos operacijas pagal Vincent Driessen šakojimosi modelį.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>daugiau</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Ši paruoštukė parodo pagrindinį git-flow operacijų panaudojimą ir
|
||||
efektą
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Bendri patarimai</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git flow suteikia puikią komandinės eilutės pagalbą ir išvedimą.
|
||||
Skaitykite tai atsargiai, kad pamatytumėte, kas vyksta...
|
||||
</li>
|
||||
<li>
|
||||
macOS/Windows klientas
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> yra puikus
|
||||
git grafinis klientas ir palaiko git-flow
|
||||
</li>
|
||||
<li>
|
||||
Git-flow yra apjunginėjimu paremtas sprendimas. Jis nepakeičia šakų
|
||||
bazės ypatybių.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Nustatymas</a></h2>
|
||||
<ul>
|
||||
<li>Pačiai pradžiai yra reikalinga git instaliacija.</li>
|
||||
<li>Git flow veikia macOS, Linux ir Windows sistemose</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh
|
||||
| bash
|
||||
</blockquote>
|
||||
<p>Jums reikia wget ir util-linux, kad įdiegtumėte git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Detalesnė git flow įdiegimo instaliacija yra pasiekiama
|
||||
<a href="https://github.com/nvie/gitflow/wiki/Windows"
|
||||
>git flow wiki</a
|
||||
>
|
||||
puslapyje.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Pradžia</a></h2>
|
||||
<p>
|
||||
Git flow turi būti inicializuotas, kad būtų galima tinkinti jūsų
|
||||
projektą.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inicializacija</h3>
|
||||
|
||||
<p>
|
||||
Norint pradėti naudoti git-flow by esančioje git repozitorijoje:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Jums reikės turėti atsakymus į kelis klausimus, susijusius su jūsų
|
||||
šakų pavadinimais.<br />
|
||||
Rekomenduojama naudoti numatytąsias reikšmes.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Ypatybės</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Vystykite naujas ypatybes artėjantiems išleidimams</li>
|
||||
<li>Tipiškai yra tik kūrėjų repozitorijose</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Pradėti naują ypatybę</h3>
|
||||
<p>Naujų ypatybių kūrimas prasideda nuo 'develop' šakos.</p>
|
||||
<p>Pradėkite kurti naują ypatybę su komanda</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
Ši komanda sukuria naujos ypatybės šaką pagal 'develop' ir
|
||||
pasikeičia į ją
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Užbaigti ypatybę</h3>
|
||||
|
||||
<p>Užbaigti ypatybės kūrimą. Šis veiksmas atlieka tai:</p>
|
||||
<ul>
|
||||
<li>Sujungia MYFEATURE į 'develop'</li>
|
||||
<li>Pašalina ypatybės šaką</li>
|
||||
<li>Grįžta atgal į 'develop' šaką</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publikuoti ypatybę</h3>
|
||||
|
||||
<p>
|
||||
Ar kuriate ypatybę komandoje? <br />
|
||||
Publikuokite ypatybę į nuotolinį serverį, jog jį galėtų pasiekti
|
||||
kiti naudotojai.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publikuotos ypatybės gavimas</h3>
|
||||
|
||||
<p>Gauti kito naudotojo publikuotą ypatybę.</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>
|
||||
Galite sekti ypatybę kilmėje naudodami
|
||||
<code> git flow feature track MYFEATURE</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Atlikti išleidimą</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Palaiko pasiruošimą naujam išleidimui</li>
|
||||
<li>
|
||||
Leidžia mažybinius trikių ištaisymus ir paruošia metaduomenis
|
||||
išleidimui
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Pradėti išleidimą</h3>
|
||||
|
||||
<p>
|
||||
Norint pradėti išledimą, naudokite git glow release komandą. Ji
|
||||
sukuria išleidimo šaką pagal 'develop' šaką.
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
Galite pasirinktinai nurodyti <code>[BASE]</code> komito sha-1
|
||||
hash'ą, nuo kurio norite pradėti. Komitas privalo būti 'develop'
|
||||
šakoje.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
Yra išmintinga publikuoti išleidimo šaką po to, kai leista daryti
|
||||
išleidimo komitus kitiems naudotojams. Tai daroma panašiai kaip ir
|
||||
su ypatybės išleidimu:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(Galite sekti nuotolinį išleidimą su <br /><code
|
||||
>git flow release track RELEASE</code
|
||||
>
|
||||
komanda)
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Užbaigti išleidimą</h3>
|
||||
|
||||
<p>
|
||||
Išleidimo užbaigimas yra vienas iš didelių žingsnių git šakojime.
|
||||
Jis atlieka kelis veiksmus:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Sujungia išleidimo šaką atgal į 'master'</li>
|
||||
<li>Pažymi išleidimą kartu su gairės vardu</li>
|
||||
<li>Atgal-sujungia išleidimą su 'develop'</li>
|
||||
<li>Pašalina išledimo šaką</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>Nepamirškite persiųsti gaires su <code>git push --tags</code></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Pataisymai</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Pataisymai atsiranda iš būtinumo taisyti jau išleistos versijos
|
||||
netenkinamą būseną
|
||||
</li>
|
||||
<li>
|
||||
Gali būti iššakotos nuo susijusios gairės master šakoje, kuri žymi
|
||||
produkcijos versiją.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Kaip ir kitos git flow komandos, pataisymas yra pradedamas su</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
Versijos argumentas čia žymi naują pataisymo išleidimo pavadinimą.
|
||||
Pasirinktinai dar galite nurodyti pagrindinį vardą nuo kurio
|
||||
pradėti.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Užbaigti pataisymą</h3>
|
||||
|
||||
<p>
|
||||
Užbaigiant pataisymą jis yra sujungiamas atgal į develop ir master
|
||||
šakas. Taip pat master sujungimas yra pažymimas su pataisymo
|
||||
versija.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Komandos</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Pastabos</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Ne visos galimos komandos yra čia aprašytos, tik svarbiausios</li>
|
||||
<li>
|
||||
Jūs vis tiek galite naudoti standartines git komandas kaip ir
|
||||
anksčiau, git flow yra įrankinių rinkinys
|
||||
</li>
|
||||
<li>
|
||||
'support' ypatybė vis dar yra beta, jos naudojimas yra nepatartinas
|
||||
</li>
|
||||
<li>
|
||||
Jeigu norite pateikti vertimus, būsiu laimingas galėdamas juos
|
||||
integruoti
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Komentarai</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "http://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Įgalinkite JavaScript kad peržiūrėti
|
||||
<a href="http://disqus.com/?ref_noscript">komentarus palaiko Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>komantarus tvarko <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
411
index.nl_NL.html
@ -1,411 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_gaq.push(['_trackPageview']);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement('script');
|
||||
ga.type = 'text/javascript';
|
||||
ga.async = true;
|
||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
||||
var s = document.getElementsByTagName('script')[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
gemaakt door <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
|
||||
<script>!function (d, s, id) {
|
||||
var js, fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
}(document, "script", "twitter-wjs");</script>
|
||||
</p>
|
||||
<p id="desc">efficient branchen met behulp van git-flow door <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">vertalingen:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="#" class="active" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Over</h2>
|
||||
|
||||
<p>
|
||||
git-flow is een set van git extensies voor high-level repository operaties voor Vincent
|
||||
Driessen's branching model.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">meer</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Dit cheatsheet laat het basisgebruik en de effecten zien van git-flow operaties</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Basistips</h2>
|
||||
<ul>
|
||||
<li>Git flow biedt uitstekende commandline hulp en output. Lees het zorgvuldig om te zien wat er gebeurt...</li>
|
||||
<li>Het macOS/Windows programma <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is een uitstekende grafische git interface en biedt
|
||||
git-flow ondersteuning
|
||||
</li>
|
||||
<li>Git-flow is een op merge gebaseerde oplossing. Het rebaset feature branches niet.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Installatie</a></h2>
|
||||
<ul>
|
||||
<li>Je hebt een werkende git installatie nodig.</li>
|
||||
<li>Git flow werkt op macOS, Linux en Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Je hebt wget en util-linux nodig om git-flow te installeren.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Gedetailleerde installatie instructies voor git flow kun je vinden op de <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Aan de slag</a></h2>
|
||||
<p>Git flow moet geinitializeerd zijn om je project setup aan te passen.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Initializatie</h3>
|
||||
|
||||
<p>Je kan git-flow initializeren door het volgende commando in een bestaande git repository uit te voeren:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Je dient een paar vragen te beantwoorden over de naamgevingsconventies voor je branches.<br/>
|
||||
Het is aanbevolen om de standaard waarden te gebruiken.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Features</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Ontwikkel nieuwe features voor aankomende releases</li>
|
||||
<li>Bestaat typisch alleen in de repository van de ontwikkelaar</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Een nieuwe feature starten</h3>
|
||||
<p>Nieuwe features hebben de 'develop' branch als uitgangspunt.</p>
|
||||
<p>Start met ontwikkelen van een nieuwe feature met</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Deze actie maakt een nieuwe feature branch gebaseerd op 'develop' en schakelt over naar deze</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Het afronden van een feature</h3>
|
||||
|
||||
<p>
|
||||
Rond de ontwikkeling van een feature af.
|
||||
Deze actie voert de volgende stappen uit
|
||||
</p>
|
||||
<ul>
|
||||
<li>Merge MYFEATURE in 'develop'</li>
|
||||
<li>Verwijdert de feature branch</li>
|
||||
<li>Schakelt terug naar de 'develop' branch</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Een feature publiceren</h3>
|
||||
|
||||
<p>
|
||||
Ontwikkel je de feature samen met anderen? <br/>
|
||||
Publiceer de feature branch dan naar de remote server zodat anderen deze branch ook kunnen gebruiken.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Een gepubliceerde feature ophalen</h3>
|
||||
|
||||
<p>
|
||||
Haal een door een andere ontwikkelaar gepubliceerde feature op.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>Je kan de wijzigingen op de feature bijhouden op de server door <code> git flow feature track MYFEATURE</code> uit te voeren</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Een release maken</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Ondersteunt de voorbereiding op een nieuwe productie release</li>
|
||||
<li>Staat kleine bugfixes toe en bereidt meta-data van een release voor</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Een release starten</h3>
|
||||
|
||||
<p>Om een release te starten, kun je het git flow release commando gebruiken. Dit</p>
|
||||
maakt een release branch aan gebaseerd op de 'develop' branch.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>Je kan optioneel een <code>[BASE]</code> commit sha-1 hash toevoegen om de release hiervandaan te beginnen. Deze commit moet op de
|
||||
'develop' branch aanwezig zijn.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Het is verstandig om de release branch te publiceren zodat andere ontwikkelaars hieraan kunnen meewerken. Dit lijkt op het publiceren van een feature branch:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(Je kan wijzigingen op de release branch bijhouden met het <br/><code>git flow release track RELEASE</code> commando)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Een release afronden</h3>
|
||||
|
||||
<p>Een release afronden is een grote stap in git branchen. Het voert verschillende acties uit:</p>
|
||||
<ul>
|
||||
<li>De release branch wordt terug in 'master' gemerged</li>
|
||||
<li>De release wordt getagged met zijn naam</li>
|
||||
<li>De release wordt terug in 'develop' gemerged</li>
|
||||
<li>Verwijdert de release branch</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>Vergeet niet je tags te pushen met <code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Hotfixes ontstaan wanneer er onmiddellijk gehandeld moet worden na een bug in de live versie
|
||||
</li>
|
||||
<li>Kan de corresponderende tag op de 'master' branch als basis hebben.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Zoals andere git flow commando's, een hotfix wordt gestart door</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>Het VERSION argument slaat op de nieuwe hotfix release naam. Optioneel kun je de BASENAME aangeven waarvandaan begonnen moet worden.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Een hotfix afronden</h3>
|
||||
|
||||
<p>Het afronden van een hotfix zorgt ervoor dat deze zowel in develop als in master gemerged wordt. Aansluitend wordt de merge in de master getagged met de hotfix versie.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Commando's</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Niet alle beschikbare commando's zijn hier behandeld, alleen de belangrijkste</li>
|
||||
<li>Je kan git en al zijn commando's gewoon blijven gebruiken daar git flow alleen een handig gereedschap is</li>
|
||||
<li>De 'support' feature is nog steeds in beta, het gebruik hiervan wordt niet geadviseerd</li>
|
||||
<li>Als je vertalingen wilt aanleveren, zal ik deze graag integreren</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Reacties</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement('script');
|
||||
dsq.type = 'text/javascript';
|
||||
dsq.async = true;
|
||||
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
511
index.pl_PL.html
@ -1,511 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="pl" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>ściągawka do git-flow</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Lobster&subset=latin,latin-ext"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<style>
|
||||
.title,
|
||||
h1,
|
||||
h2,
|
||||
h2 a,
|
||||
h3 {
|
||||
font-family: "Lobster";
|
||||
}
|
||||
</style>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">ściągawka do git-flow</h1>
|
||||
|
||||
<p id="author">
|
||||
Autor: <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
sprawne rozgałęzianie z git-flow autorstwa
|
||||
<a href="http://nvie.com/">Vincenta Driessen'a</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
tłumaczenia: <a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="#" class="active" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>Wprowadzenie</h2>
|
||||
|
||||
<p>
|
||||
git-flow jest zbiorem rozszerzeń gita dostarczającym wysokopoziomowe
|
||||
operacje na repozytorium, wspierającym strategię rozgałęziania
|
||||
opracowaną przez Vincenta Driessena.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>Czytaj więcej</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Ta ściągawka prezentuje podstawy użycia i efekt działania operacji
|
||||
git-flow.
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Podstawowe wskazówki</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git flow dostarcza świetną pomoc z poziomu wiersza poleceń. Czytaj
|
||||
ją uważne, aby wiedzieć, co się dzieje...
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> - klient dla
|
||||
OSX/Windowsa, który jest wyśmienitą nakładką graficzną dla gita
|
||||
posiadającą wsparcie dla git-flow.
|
||||
</li>
|
||||
<li>
|
||||
Git-flow bazuje na scalaniu. Nie używa rebase do integrowania zmian.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Konfiguracja</a></h2>
|
||||
<ul>
|
||||
<li>Zanim zaczniesz, potrzebujesz działającego gita.</li>
|
||||
<li>Git flow działa na OSX, Linuxie oraz Windowsie.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>Potrzebujesz wget oraz util-linux żeby zainstalować git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Szczegółową instrukcję instalacji git-flow możesz znaleźć na stronie
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>wiki</a
|
||||
>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started">Pierwsze kroki</a>
|
||||
</h2>
|
||||
<p>
|
||||
Żeby dostosować ustawienia Twojego projektu, git flow musi zostać
|
||||
zainicjalizowany.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inicjalizacja</h3>
|
||||
|
||||
<p>
|
||||
Rozpocznij używanie git-flow inicjalizując go w istniejącym
|
||||
repozytorium gita:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Będziesz musiał odpowiedzieć na kilka pytań dotyczących nazewnictwa
|
||||
gałęzi.<br />
|
||||
Zaleca się stosowanie wartości domyślnych.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Funkcjonalności</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Dostarczają nowych funkcjonalności do nadchodzących wydań.</li>
|
||||
<li>Zazwyczaj istnieją tylko w repozytoriach deweloperów.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Rozpocznij nową funkcjonalność</h3>
|
||||
<p>
|
||||
Rozwój nowej funkcjonalności rozpoczyna się od gałęzi 'develop'.
|
||||
</p>
|
||||
<p>Rozpocznij rozwój nowej funkcjonalności używając:</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
W ten sposób tworzysz gałąź dla nowej funkcjonalności bazując na
|
||||
gałęzi 'develop' jednocześnie się na nią przełączając.
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Zakończ funkcjonalność</h3>
|
||||
|
||||
<p>Zakończenie rozwoju funkcjonalności. Ta czynność spowoduje:</p>
|
||||
<ul>
|
||||
<li>Scalenie gałęzi MYFEATURE do gałęzi 'develop'</li>
|
||||
<li>Usunięcie gałęzi funkcjonalności</li>
|
||||
<li>Przełączenie z powrotem do gałęzi 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Opublikowanie funkcjonalności</h3>
|
||||
|
||||
<p>
|
||||
Rozwijasz funkcjonalność w grupie? <br />
|
||||
Opublikuj funkcjonalność na serwerze zdalnym, dzięki czemu inni też
|
||||
będą jej mogli z niej korzystać.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Pobieranie opublikowanej zmiany</h3>
|
||||
|
||||
<p>Pobierz zmianę opublikowaną przez innego użytkownika.</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>
|
||||
Możesz śledzić zmianę na serwerze źródłowym używając
|
||||
<code>git flow feature track MYFEATURE</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Utwórz wydanie</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Wspomaga przygotowanie nowego wydania produkcyjnego</li>
|
||||
<li>
|
||||
Pozwala na drobne poprawki błędów oraz przygotowanie metadanych dla
|
||||
wydania
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Rozpocznij wydanie</h3>
|
||||
|
||||
<p>
|
||||
Aby rozpocząć wydanie użyj polecenia git flow release. Zostanie
|
||||
stworzona gałąź wydania bazująca na gałęzi 'develop'.
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
Opcjonalnie w <code>[BASE]</code> możesz podać skrót sha-1 zmiany od
|
||||
której chcesz rozpocząć wydanie. Zmiana musi pochodzić z gałęzi
|
||||
'develop'.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
Mądrze jest opublikować gałąź wydania po tym jak się ją stworzy,
|
||||
umożliwiając dodawanie zmian do wydania innym deweloperom. Możesz
|
||||
tego dokonać analogicznie do opublikowania funkcjonalności:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(Używając polecenia <br /><code
|
||||
>git flow release track RELEASE</code
|
||||
>
|
||||
możesz śledzić zdalne wydanie)
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Zakończ wydanie</h3>
|
||||
|
||||
<p>
|
||||
Kończenie wydania jest jednym z dużych kroków podczas pracy z
|
||||
gałęziami gita. Realizuje ono szereg działań:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Scala gałąź wydania do gałęzi 'master'</li>
|
||||
<li>Taguje wydanie jego nazwą</li>
|
||||
<li>Scala z powrotem gałąź wydania do gałęzi 'develop'</li>
|
||||
<li>Usuwa gałąź wydania</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
Nie zapomnij o wypchnięciu tagów poleceniem
|
||||
<code>git push --tags</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Poprawki</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Poprawki wynikają z konieczności podjęcia natychmiastowych działań
|
||||
wobec niepożądanego stanu działającej w wersji produkcyjnej
|
||||
</li>
|
||||
<li>
|
||||
Mogą rozgałęziać się od odpowiedniego tagu wskazującego wersję
|
||||
produkcyjną.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Podobnie jak inne operacje git flow, poprawkę rozpoczyna się od</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
Parametr VERSION znakuje nazwę nowej poprawki. Opcjonalnie w
|
||||
BASENAME możesz podać nazwę gałęzi od której rozpoczniesz.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Zakończ poprawkę</h3>
|
||||
|
||||
<p>
|
||||
Operacja kończenia poprawki scala poprawkę do gałęzi develop oraz
|
||||
master. Dodatkowo scalenie do gałęzi master jest tagowane wersją
|
||||
poprawki.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Polecenia</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Końcowe uwagi</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
Nie zostały tutaj opisane wszystkie dostępne polecenia, a jedynie te
|
||||
najważniejsze
|
||||
</li>
|
||||
<li>
|
||||
Możesz wciąż normalnie używać gita oraz wszystkich jego poleceń tak
|
||||
jak to robiłeś do tej pory - git flow jest tylko zestawem
|
||||
dodatkowych narzędzi
|
||||
</li>
|
||||
<li>
|
||||
Funkcjonalność 'support' jest wciąż w fazie beta - użycie jej nie
|
||||
jest zalecane
|
||||
</li>
|
||||
<li>
|
||||
Jeśli chciałbyś dostarczyć poprawki do tego tłumaczenia, z chęcią je
|
||||
dołączę.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Komentarze</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Włącz obsługę JavaScript, aby zobaczyć
|
||||
<a href="http://disqus.com/?ref_noscript"
|
||||
>komentarze dostarczane przez Disqus.</a
|
||||
>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comments powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
483
index.pt_BR.html
@ -1,483 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="pt" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>cheatsheet do git-flow</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork no GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">cheatsheet do git-flow</h1>
|
||||
|
||||
<p id="author">
|
||||
criado por <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
sistema de branches eficiente usando o git-flow, do
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
traduções: <a href="index.html" title="Inglês">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="#" class="active" title="Português Brasileiro"
|
||||
>Português Brasileiro</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2><a name="sobre" href="#sobre">Sobre</a></h2>
|
||||
|
||||
<p>
|
||||
O git-flow é um conjunto de extensões para o git que provê operações
|
||||
de alto-nível para repositórios usando o modelo de branches do Vincent
|
||||
Driessen.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>mais</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Este cheatsheet demonstra o uso básico e o efeito das operações do
|
||||
git-flow
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="dicas_basicas" href="#dicas_basicas">Dicas básicas</a></h2>
|
||||
<ul>
|
||||
<li>
|
||||
O git-flow oferece na linha de comando ajuda e saídas excelentes.
|
||||
Leia atentamente para ver o que está acontecendo...
|
||||
</li>
|
||||
<li>
|
||||
O cliente do macOS
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> é um
|
||||
excelente gui para o git e tem suporte ao git-flow
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="instalacao" href="#instalacao">Instalação</a></h2>
|
||||
<ul>
|
||||
<li>Você precisa do git instalado como pré-requisito.</li>
|
||||
<li>O git flow funciona no macOS, Linux e no Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Para instruções detalhadas sobre a instalação, visite a
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>wiki do git-flow</a
|
||||
>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comecando" href="#comecando">Começando</a></h2>
|
||||
<p>
|
||||
O git-flow precisa ser inicializado para personalizar a configuração
|
||||
de seu projeto.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inicialização</h3>
|
||||
|
||||
<p>
|
||||
Comece o uso do git-flow fazendo sua inicialização dentro de um
|
||||
repositório git existente:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Você precisa responder algumas questões relativas às convenções de
|
||||
nomenclatura dos seus branches.<br />
|
||||
É recomendado que sejam usados os valores padrões.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="features" href="#features">Funcionalidades/features</a>
|
||||
</h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Desenvolva novas funcionalidades para as versões futuras</li>
|
||||
<li>
|
||||
Normalmente existem apenas nos repositórios dos desenvolvedores
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Começar uma nova funcionalidade</h3>
|
||||
<p>
|
||||
O desenvolvimento de novas funcionalidades começa no branch
|
||||
'develop'.
|
||||
</p>
|
||||
<p>Comece o desenvolvimento de uma nova funcionalidade com</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
Esse comando cria um novo branch da funcionalidade baseado no
|
||||
'develop' e alterna para ele
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finalizar uma funcionalidade</h3>
|
||||
|
||||
<p>
|
||||
Finaliza o desenvolvimento de uma funcionalidade. Esse comando faz o
|
||||
seguinte
|
||||
</p>
|
||||
<ul>
|
||||
<li>Mescla MYFEATURE no 'develop'</li>
|
||||
<li>Remove o branch da funcionalidade</li>
|
||||
<li>Volta para o branch 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publicar uma funcionalidade</h3>
|
||||
|
||||
<p>
|
||||
Você está desenvolvendo uma funcionalidade colaborativamente? <br />
|
||||
Publique uma funcionalidade para o servidor remoto, assim ela pode
|
||||
ser utilizada por outros usuários.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Obter uma funcionalidade publicada</h3>
|
||||
|
||||
<p>
|
||||
Obtenha uma funcionalidade publicada por outro usuário e acompanhe
|
||||
as alterações remotas.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature pull MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Criar uma versão/release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Auxilia a preparação de uma nova versão de produção</li>
|
||||
<li>
|
||||
Permite correções de bugs menores e a preparação de metadados de uma
|
||||
versão
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Começar uma versão</h3>
|
||||
|
||||
<p>
|
||||
Para começar uma versão, use o comando git flow release. Ele<br />
|
||||
cria um branch da versão baseado no branch 'develop'.
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
Você pode opcionalmente fornecer um hash sha-1 do commit
|
||||
<code>[BASE]</code> de onde começar a versão. O commit precisa estar
|
||||
no branch 'develop'
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
É sensato publicar o branch da versão depois de criá-lo, para
|
||||
permitir commits por outros desenvolvedores. É semelhante à
|
||||
publicação de uma funcionalidade com o comando:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(Você pode acompanhar uma versão remota com o comando <br /><code
|
||||
>git flow release track RELEASE</code
|
||||
>)
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finalizar uma versão</h3>
|
||||
|
||||
<p>
|
||||
A finalização de uma versão é um dos grandes passos na
|
||||
ramificação/branching do git. Ele executa várias ações:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Mescla o branch da versão no 'master'</li>
|
||||
<li>Etiqueta a versão com seu nome</li>
|
||||
<li>Mescla o branch da versão de volta no 'develop'</li>
|
||||
<li>Remove o branch da versão</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Os hotfixes surgem da necessidade de agir imediatamente sobre uma
|
||||
situação indesejada na versão de produção ativa
|
||||
</li>
|
||||
<li>
|
||||
Pode ser criado a partir da tag correspondente no branch master que
|
||||
indica a versão em produção.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Assim como os outros comandos do git flow, um hotfix inicia com</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
O argumento version marca o nome do novo hotfix. Opcionalmente, você
|
||||
pode especificar um basename para começar.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finalizar um hotfix</h3>
|
||||
|
||||
<p>
|
||||
Ao finalizar um hotfix ele é mesclado tanto no develop quanto no
|
||||
master. Além disso, o merge no master é etiquetado.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comandos" href="#comandos">Comandos</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
Nem todos os comandos disponíveis estão cobertos aqui, apenas os
|
||||
mais importantes deles
|
||||
</li>
|
||||
<li>
|
||||
Você pode continuar a usar o git e todos os comandos dele
|
||||
normalmente como você já conhece, o git flow é apenas uma coleção de
|
||||
ferramentas
|
||||
</li>
|
||||
<li>
|
||||
A funcionalidade 'support' continua no estágio beta, seu uso não é
|
||||
indicado
|
||||
</li>
|
||||
<li>
|
||||
Se você quiser fornecer traduções, ficarei feliz de integrá-las
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2>Comentários</h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
<script type="text/javascript">
|
||||
/* * * Google Analytics * * */
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Habilite o JavaScript para ver os
|
||||
<a href="http://disqus.com/?ref_noscript"
|
||||
>comentários criados com o Disqus.</a
|
||||
>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comentários criados com o <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
513
index.ro_RO.html
@ -1,513 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
lucrul eficient cu branch-uri folosind git-flow al lui
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
traduceri: <a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="#" class="active" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>Despre</h2>
|
||||
|
||||
<p>
|
||||
git-flow sunt un set de extensii git care furnizează operații de nivel
|
||||
înalt pentru întreg repository-ul folosind modelul de branch-uri al
|
||||
lui Vincent Driessen.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>mai mult</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Această copiuță arată scenariile de bază, precum și efectul folosirii
|
||||
operațiilor git-flow.
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Pentru început</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git flow oferă ajutor și output excelente direct în linia de
|
||||
comandă. Citește-le cu atenție pentru a observa ce se întâmplă...
|
||||
</li>
|
||||
<li>
|
||||
Clientul
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> pentru
|
||||
macOS/Windows este o interfață excelentă pentru git și are suport
|
||||
pentru git-flow
|
||||
</li>
|
||||
<li>
|
||||
Git-flow este o soluție bazată pe merge-uri. Nu face rebase pe
|
||||
branch-urile de tip feature.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Instalare</a></h2>
|
||||
<ul>
|
||||
<li>Ca și precondiții este nevoie de o instalare git funcțională.</li>
|
||||
<li>Git flow funcționează pe macOS, Linux și Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>
|
||||
Vei avea nevoie de wget și de util-linux pentru a instala git-flow.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Pentru instrucțiuni detaliate de instalare a git flow te rugăm să
|
||||
vizitezi
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>wiki-ul git flow</a
|
||||
>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started">La început</a>
|
||||
</h2>
|
||||
<p>
|
||||
Git flow trebuie să fie inițializat pentru a putea personaliza
|
||||
proiectul tău.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inițializare</h3>
|
||||
|
||||
<p>
|
||||
Începe folosirea git-flow prin a-l inițializa în interiorul unui
|
||||
repository git deja existent:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Va fi necesar să răspunzi la căteva întrebări legate de convențiile
|
||||
de numire pentru branch-urile tale.<br />
|
||||
Se recomandă să folosești valorile implicite.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="features" href="#features">Funcționalități/Features</a>
|
||||
</h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Dezvoltă noi funcționalități pentru viitoarele release-uri</li>
|
||||
<li>Există de obicei doar în repository-urile programatorilor</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Începere funcționalitate nouă</h3>
|
||||
<p>
|
||||
Dezvoltarea de funcționalități noi începe din branch-ul 'develop'.
|
||||
</p>
|
||||
<p>Începe dezvoltarea unei funcționalități noi cu</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
Această acțiune crează un nou branch bazat pe 'develop' și se mută
|
||||
pe el
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finalizare funcționalitate</h3>
|
||||
|
||||
<p>
|
||||
Încheie dezvoltarea unei funcționalități. Această acțiune execută
|
||||
următoarele operații
|
||||
</p>
|
||||
<ul>
|
||||
<li>Face merge al branch-ului MYFEATURE în 'develop'</li>
|
||||
<li>Șterge branch-ul de tip funcționalitate</li>
|
||||
<li>Se mută înapoi pe branch-ul 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publicare funcționalitate</h3>
|
||||
|
||||
<p>
|
||||
Dezvolți funcționalitate în colaborare cu altcineva? <br />
|
||||
Publică-ți funcționalitatea pe server, ca ea să poată fi folosită și
|
||||
de alți utilizatori.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Obținerea unei funcționalități publicate</h3>
|
||||
|
||||
<p>Obține funcționalitate publicată de către un alt utilizator.</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>
|
||||
Poți urmări o funcționalitate la repository-ul origine folosind
|
||||
<code> git flow feature track MYFEATURE</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Predare/Release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Ajută la pregătirea unui nou release în producție</li>
|
||||
<li>
|
||||
Permite fixarea unor probleme minore, precum și pregătirea
|
||||
meta-datelor asociate unui release
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Începere release</h3>
|
||||
|
||||
<p>
|
||||
Pentru a începe un release nou, folosește comanda git flow release.
|
||||
Aceasta crează un nou branch de tip release bazat pe branch-ul
|
||||
'develop'.
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BAZE]</blockquote>
|
||||
<p>
|
||||
Este posibilă furnizarea unei <code>[BAZE]</code> sha-1 de commit
|
||||
pentru a fi folosit drept bază a release-ului ce se crează. Acest
|
||||
commit trebuie să existe pe branch-ul 'develop'.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
Este înțelept a publica branch-ul de release după ce a fost creat,
|
||||
pentru a permite și altor programatori să contribuie. Acest proces
|
||||
este similar celui de publicare funcționalitate; se folosește
|
||||
comanda:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(Poți urmări un release cu comanda <br /><code
|
||||
>git flow release track RELEASE</code
|
||||
>)
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finalizare release</h3>
|
||||
|
||||
<p>
|
||||
Finalizarea unui release este unul din cei mai importanți pași din
|
||||
lucrul cu branch-urile în git. Se efectuează câteva acțiuni:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Merge al branch-ului release înapoi în 'master'</li>
|
||||
<li>Crează tag (etichetă) pentru release, cu numele acestuia</li>
|
||||
<li>Merge al release-ului în branch-ul 'develop'</li>
|
||||
<li>Șterge branch-ul de release</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
Nu uita să publici etichetele cu comanda
|
||||
<code>git push --tags</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Corecturi/Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Corecturile provin din necesitatea de a acționa cât mai curând
|
||||
asupra unei stări nedorite a unei versiuni deja livrate
|
||||
</li>
|
||||
<li>
|
||||
Se poate baza pe eticheta de pe branch-ul master corespunzătoare
|
||||
release-ului țintit.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Începere corectură</h3>
|
||||
|
||||
<p>Asemeni celorlalte comezi git flow, o corectură se începe cu</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
Argumentul VERSION markează noul nume de release ce va fi atribuit
|
||||
corecturii. În mod opțional poți preciza un nume de bază de la care
|
||||
se va porni în crearea corecturii.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finalizare corectură</h3>
|
||||
|
||||
<p>
|
||||
Prin finalizarea unei corecturi, aceasta va fi merge-uită înapoi în
|
||||
branch-urile 'develop' și 'master'. Suplimentar, 'master' va fi
|
||||
etichetat cu versiunea corecturii.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Comenzi</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Rezerve</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
Nu toate comenzile disponibile sunt acoperite aici, ci doar cele mai
|
||||
importante
|
||||
</li>
|
||||
<li>
|
||||
Poți folosi în continuare git și toate comenzile sale în mod normal,
|
||||
așa cum le cunoști, deoarece git flow este doar o colecție de
|
||||
instrumente suplimentare
|
||||
</li>
|
||||
<li>
|
||||
Facilitatea de 'support' este încă în beta, de aceea folosirea sa nu
|
||||
este recomandată
|
||||
</li>
|
||||
<li>
|
||||
Dacă dorești să ajuti la traducere, voi fi fericit să le integrez
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comentarii</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Te rugăm să activezi JavaScript pentru a vizualiza
|
||||
<a href="http://disqus.com/?ref_noscript"
|
||||
>comentariile oferite cu sprijinul Disqus.</a
|
||||
>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comentarii cu sprijinul <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
525
index.ru_RU.html
@ -1,525 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>Шпаргалка по git-flow</title>
|
||||
|
||||
<!-- Lobster is same as Sansita but with cyrillic and another subsets. I recomend to use Lobster instead Sansita everywere-->
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Lobster&subset=latin,cyrillic"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<style>
|
||||
.title,
|
||||
h1,
|
||||
h2,
|
||||
h2 a,
|
||||
h3 {
|
||||
font-family: "Lobster";
|
||||
}
|
||||
</style>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">Шпаргалка по git-flow</h1>
|
||||
|
||||
<p id="author">
|
||||
создал <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
эффективное ветвление с помощью git-flow от
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
переводы: <a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="#" class="active" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>Введение</h2>
|
||||
|
||||
<p>
|
||||
git-flow — это набор расширений git предоставляющий высокоуровневые
|
||||
операции над репозиторием для поддержки модели ветвления Vincent
|
||||
Driessen.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>узнать больше</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Эта шпаргалка показывает основные способы использования операций
|
||||
git-flow.
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Общие замечания</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git flow предоставляет превосходную командную строку со справкой и
|
||||
улучшенными выводом. Внимательно читайте его, чтобы знать, что
|
||||
происходит...
|
||||
</li>
|
||||
<li>
|
||||
Клиент для macOS/Windows
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> — отличный
|
||||
GUI для Git — также поддерживает git-flow
|
||||
</li>
|
||||
<li>
|
||||
Git-flow основан на слиянии. Для слияния веток фич не используется
|
||||
rebase.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Установка</a></h2>
|
||||
<ul>
|
||||
<li>В первую очередь вам нужна рабочая установка git</li>
|
||||
<li>Git flow работает на macOS, Linux и Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>Вам потребуется wget и util-linux для установки git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Подробные инструкции по установке git flow смотрите на
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>git flow wiki</a
|
||||
>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started"
|
||||
>Приступая к работе</a
|
||||
>
|
||||
</h2>
|
||||
<p>
|
||||
Git flow нужно инициализировать, чтобы настроить его для работы с
|
||||
вашим проектом.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Инициализация</h3>
|
||||
|
||||
<p>
|
||||
Для начала использования git-flow проинициализируйте его внутри
|
||||
существующего git-репозитория:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Вам придётся ответить на несколько вопросов о способах именования
|
||||
ваших веток.<br />
|
||||
Рекомендуется оставить значения по умолчанию.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Фичи</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Разработка новых фич для последующих релизов</li>
|
||||
<li>Обычно присутствует только в репозиториях разработчиков</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Начало новой фичи</h3>
|
||||
<p>Разработка новых фич начинается из ветки "develop".</p>
|
||||
<p>Для начала разработки фичи выполните:</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
Это действие создаёт новую ветку фичи, основанную на ветке
|
||||
"develop", и переключается на неё.
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Завершение фичи</h3>
|
||||
|
||||
<p>Окончание разработки фичи. Это действие выполняется так:</p>
|
||||
<ul>
|
||||
<li>Слияние ветки MYFEATURE в "develop"</li>
|
||||
<li>Удаление ветки фичи</li>
|
||||
<li>Переключение обратно на ветку "develop"</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Публикация фичи</h3>
|
||||
|
||||
<p>
|
||||
Вы разрабатываете фичу совместно с коллегами? <br />
|
||||
Опубликуйте фичу на удалённом сервере, чтобы её могли использовать
|
||||
другие пользователи.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Получение опубликованной фичи</h3>
|
||||
|
||||
<p>Получение фичи, опубликованной другим пользователем.</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>
|
||||
Вы можете отслеживать фичу в репозитории origin с помощью команды
|
||||
<code> git flow feature track MYFEATURE</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Создание релиза</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Поддержка подготовки нового релиза продукта</li>
|
||||
<li>
|
||||
Позволяет устранять мелкие баги и подготавливать различные
|
||||
метаданные для релиза
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Начало релиза</h3>
|
||||
|
||||
<p>
|
||||
Для начала работы над релизом используйте команду
|
||||
<code>git flow release</code>
|
||||
Она создаёт ветку релиза, ответляя от ветки "develop".
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
При желании вы можете указать <code>[BASE]</code>-коммит в виде его
|
||||
хеша sha-1, чтобы начать релиз с него. Этот коммит должен
|
||||
принадлежать ветке "develop".
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
Желательно сразу публиковать ветку релиза после создания, чтобы
|
||||
позволить другим разработчиками выполнять коммиты в ветку релиза.
|
||||
Это делается так же, как и при публикации фичи, с помощью
|
||||
команды:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
Вы также можете отслеживать удалённый релиз с помощью команды
|
||||
<br /><code>git flow release track RELEASE</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Завершение релиза</h3>
|
||||
|
||||
<p>
|
||||
Завершение релиза — один из самых больших шагов в git-ветвлени. При
|
||||
этом происходит несколько действий:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Ветка релиза сливается в ветку "master"</li>
|
||||
<li>Релиз помечается тегом равным его имени</li>
|
||||
<li>Ветка релиза сливается обратно в ветку "develop"</li>
|
||||
<li>Ветка релиза удаляется</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
Не забудьте отправить изменения в тегах с помощью команды
|
||||
<code>git push --tags</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Исправления</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Исправления нужны в том случае, когда нужно незамедлительно
|
||||
устранить нежелательное состояние продакшн-версии продукта
|
||||
</li>
|
||||
<li>
|
||||
Может ответвляться от соответствующего тега на ветке "master",
|
||||
который отмечает выпуск продакшн-версии
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>
|
||||
Как и в случае с другими командами git flow, работа над исправлением
|
||||
начинается так:
|
||||
</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>Аргумент VERSION определяет имя нового, исправленного релиза.</p>
|
||||
<p>
|
||||
При желании можно указать BASENAME-коммит, от которого произойдёт
|
||||
ответвление.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Завершение исправления</h3>
|
||||
|
||||
<p>
|
||||
Когда исправление готово, оно сливается обратно в ветки "develop" и
|
||||
"master". Кроме того, коммит в ветке "master" помечается тегом с
|
||||
версией исправления.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Команды</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Последние замечания</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
Здесь описаны не все доступные команды, только наиболее важные
|
||||
</li>
|
||||
<li>
|
||||
Вы можете продолжать использовать git и все его команды, как обычно,
|
||||
git flow — это просто набор дополнительных инструментов
|
||||
</li>
|
||||
<li>
|
||||
Возможности "support"-веток пока в beta-версии, использовать их не
|
||||
рекомендуется
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Презентация Git Flow</h2>
|
||||
<iframe
|
||||
src="https://docs.google.com/presentation/d/e/2PACX-1vTNxQcM4AkxZq0mK0lKy7-xscrYPPCUByX1y6tcOPvR--Buph2gxxFsIuyRMArGTw/embed?start=false&loop=false&delayms=5000"
|
||||
frameborder="0"
|
||||
width="960"
|
||||
height="569"
|
||||
allowfullscreen="true"
|
||||
mozallowfullscreen="true"
|
||||
webkitallowfullscreen="true"
|
||||
></iframe>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Комментарии</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Please enable JavaScript to view the
|
||||
<a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comments powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
540
index.tr_TR.html
@ -1,540 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="tr" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
Tasarlayan: <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>'ın verimli dallanma
|
||||
modeli kullanılarak tasarlanmıştır.
|
||||
</p>
|
||||
<p id="translations">
|
||||
çeviriler: <a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="#" class="active" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>Hakkında</h2>
|
||||
|
||||
<p>
|
||||
git-flow, Vincent Driessen'in dallanma modeli için geliştirilmiş, git
|
||||
repoları için üst düzey işlemler yapabilmenizi sağlayan, sözkonusu
|
||||
dallanma modelini kullanmayı oldukça kolaylaştıran git eklentilerini
|
||||
içerir.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
><br />Vincent Driessen'in dallanma modeli hakkında</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Bu döküman git flow işlemleri hakkında temel kullanım şekillerini
|
||||
içermektedir.
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Temel Ipuçları</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git flow komut satırları ile kusursuz yardım (help) ve çıktı
|
||||
(output) sağlar.
|
||||
</li>
|
||||
<li>
|
||||
macOS ve Windows kullanıcıları için
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> , git flowa
|
||||
destek veren mükemmel bir git gui aracıdır.
|
||||
</li>
|
||||
<li>
|
||||
Git flow birleşme-kaynaşma (merge) tabanlı bir çözümdür. Rebase
|
||||
tabanlı çözümlemelerle karıştırılmamalıdır. Merge tabanlı çözümlerde
|
||||
merge işlemi sonucunda bütün değişiklikler kendi dallanmalarındaki
|
||||
commit ile tek bir dala (branch) bağlanır, başlangıç noktası
|
||||
sabittir. Rebase tabanlı çözümlerde ise kendi dalınız (branch)
|
||||
üzerinde yaptığınız değişiklikler, son yapılan commitler başlangıç
|
||||
noktası alınarak ana dal üzerine eklenir.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Ayarlar</a></h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git flow'u kullanabilmek için öncelikli olarak git kurulumunun
|
||||
yapılması gerekmektedir.
|
||||
</li>
|
||||
<li>Git flow macOS, Linux ve Windows üzerinde çalıştırılabilir.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>Git flow kurulumu için wget ve util-linux gerekmektedir.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Git-flow kurulumu hakkında detaylı bilgi için git flow wiki'yi
|
||||
ziyaret edebilirsiniz.<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>git flow wiki</a
|
||||
>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Baslarken</a></h2>
|
||||
<p>
|
||||
Git flow, kullanmak istediğiniz projede ayarlarınızı özelleştirmek
|
||||
amacıyla başlatılır (initialize).
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Başlangıç (Initialize)</h3>
|
||||
|
||||
<p>git flow'u kullanmak istediğiniz reponuzdayken;</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>komutuyla başlatabilirsiniz.</p>
|
||||
<p>
|
||||
Bu noktada kafanızda dallarınızı (branches) isimlendirme konusuna
|
||||
ilişkin birçok soru işareti oluşacaktır. Bu bağlamda varsayılan
|
||||
(default) değerleri kullanmanız önerilir.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Özellikler (Features)</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>
|
||||
Git flow ile yayınlamak üzere olduğunuz projenize ekleyeceğiniz
|
||||
özellikler için yeni dallarda (feature) kodlama yaparsınız.
|
||||
</li>
|
||||
<li>Genel olarak sadece geliştirici repolarında bulunurlar.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Yeni bir özellik eklemesi başlatmak</h3>
|
||||
<h3>(feature start)</h3>
|
||||
<p>
|
||||
Yeni özelliklerin eklenmesi öncelikle develop dalından (branch)
|
||||
başlar.
|
||||
</p>
|
||||
<p>Yeni bir özelliği kodlamaya</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
ile başlarız. Bu komut bize develop dalını (branch) temel alan bir
|
||||
özellik dalı (feature) oluşturur. Ve bulunduğumuz dalı
|
||||
feature/MYFEATURE olarak değiştirir.
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
--></div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Bir özellik eklemesi bitirilirken (feature finish)</h3>
|
||||
|
||||
<p>Bir özelliğin eklenme işlemi bitirilirken şunları yapılır:</p>
|
||||
<ul>
|
||||
<li>
|
||||
Kendi çalıştığımız özellik dalı (burada MYFEATURE) develop ana
|
||||
dalı ile birleştirilir.
|
||||
</li>
|
||||
<li>
|
||||
Bu birleşmeden sonra kendi özellik dalımız (MYFEATURE) silinir.
|
||||
</li>
|
||||
<li>Bulunduğumuz dal tekrar develop olarak değiştirilir.</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
<p>bu işlemleri bizler için yapar.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Bir özelliği yayınlamak</h3>
|
||||
<h3>(Publish a feature)</h3>
|
||||
|
||||
<p>
|
||||
Bir ekip içerisinde geliştirme mi yapıyorsunuz ? <br />
|
||||
O zaman geliştirdiğiniz özelliği bir uzak sunucuya gönderin,
|
||||
böylelikle geliştirdiğiniz özellik diğer kullanıcılar tarafından
|
||||
kullanılabilir.Öyleyse ;
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
<p>sizin için bu işi halledebilir.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Yayınlanmış bir özelliği almak (Getting a published feature)</h3>
|
||||
|
||||
<p>
|
||||
Uzak sunucu üzerinde yayınlanmış bir özelliği kendi yerel (local)
|
||||
çalışma ortamınıza aktarırken:
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature pull MYFEATURE</blockquote>
|
||||
<p>size yardımcı olacaktır.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="release" href="#release">Bir yayın çıkarırken (release)</a>
|
||||
</h2>
|
||||
|
||||
<ul>
|
||||
<li>Yeni bir ürünün yayınlanmasına yardımcı olur.</li>
|
||||
<li>
|
||||
Küçük hata giderimleri ve meta-data hazırlığı için kullanılabilir.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Bir sürüm yayınlamak</h3>
|
||||
<h3>(Start a release)</h3>
|
||||
|
||||
<p>Yayınlamaya başlamak için,</p>
|
||||
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
komutu kullanılır.Bu komut ile develop dalını temel kabul eden bir
|
||||
release dalı (branch) yaratılır.
|
||||
</p>
|
||||
<p>
|
||||
Opsiyonel olarak yayınınızın <code>[BASE]</code> noktasından
|
||||
başlamasını sağlayabilirsiniz. Bu commit develop dalında (branch)
|
||||
iken yapılmalıdır.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
Yayınlama dalınız (release branch) oluştuktan sonra bu yöntem ile
|
||||
diğer yazılımcılar tarafından yapılan release commitlerinin de kabul
|
||||
edilmesini sağlayabilirsiniz. Bunu özellik yayınlama (feature
|
||||
publishing) ile kolaylıkla yapabilirsiniz.
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(Uzak sunucu üzerindeki yayınları <br />
|
||||
<code>git flow release track RELEASE</code>
|
||||
<br />ile izleyebilirsiniz. )
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Bir sürüm yayınını tamamlamak</h3>
|
||||
<h3>(Finish up a release)</h3>
|
||||
|
||||
<p>
|
||||
Bir sürüm yayınını tamamlarken git dallanmasının (branching) en
|
||||
büyük adımını atarız. Yayınlanma tamamlanırken:
|
||||
</p>
|
||||
<ul>
|
||||
<li>
|
||||
Yayınlama yaptığımız dal olan release dalı (branch) master ana
|
||||
dalı ile birleştirilir.
|
||||
</li>
|
||||
<li>Etiketler (tags) isimleri ile birlikte yayınlanır.</li>
|
||||
<li>
|
||||
Arkaplandaki birleştirmeler (back-merges) develop dalında
|
||||
yayınlanır.
|
||||
</li>
|
||||
<li>Yayınlama için açmış olduğumuz dal (branch) silinir.</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
sizler için bu işlemleri halledecektir. Ancak etiketlerinizi de
|
||||
eklemeyi unutmayın!
|
||||
<code>git push --tags</code> bu sorununuzu da halledecektir.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="hotfixes" href="#hotfixes">Hata giderimleri (Hotfixes)</a>
|
||||
</h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Yayına çıkarılmış bir versiyonda istenmeyen durumlar ortaya
|
||||
çıktığında ani hata giderimi için kullanılır.
|
||||
</li>
|
||||
<li>
|
||||
Hotfixler, master ana dalı (branch)ındaki versiyon numarasını
|
||||
belirten etiketten dallanır (branching).
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Bir hata giderimini başlatmak</h3>
|
||||
<h3>(git flow hotfix start)</h3>
|
||||
|
||||
<p>
|
||||
Diğer git flow komutlarında olduğu gibi bir hotfix başlatılırken :
|
||||
</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
komutu kullanılır. Versiyon argümanları yeni hotfix yayınının adını
|
||||
alır. Opsiyonel olarak başlangıç noktası için bir isim
|
||||
özelleştirmesi yapabilirsiniz (basename).
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Hata giderimi bitirme</h3>
|
||||
<h3>(Finish a hotfix)</h3>
|
||||
|
||||
<p>
|
||||
Bir hata giderimi tamamlanırken, develop ve master dalları ile
|
||||
birleştirilir. Ayrıca master dalına (branch) hotfix versiyonunun
|
||||
etiketi eklenir.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Komutlar (Commands)</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Içerik bilgisi (Backlog)</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>
|
||||
Bu dökümanda Git flow için en önemli komutlar ve kullanımları ile
|
||||
ilgili bilgiler verilmektedir. Ancak tüm Git flow komutları burda
|
||||
bahsedilenlerle sınırlı değildir.
|
||||
</li>
|
||||
<li>
|
||||
Git flow kullanırken git ve gite ait diğer alt komutları gönlünüzce
|
||||
kullanabilirsiniz. Git flow sadece bir repo derleme-toplama
|
||||
aracıdır.
|
||||
</li>
|
||||
<li>
|
||||
Support branch hala beta sürümündedir.Kullanımı tavsiye
|
||||
edilmemektedir.
|
||||
</li>
|
||||
<li>
|
||||
Çevirilerinizle bize destek olabilirsiniz.Bunları projemize
|
||||
eklemekten mutluluk duyarız.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Yorumlar (Comments)</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Please enable JavaScript to view the
|
||||
<a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comments powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
506
index.uk_UA.html
@ -1,506 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="uk" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>Шпаргалка по git-flow</title>
|
||||
|
||||
<!-- Lobster is same as Sansita but with cyrillic and another subsets. I recomend to use Lobster instead Sansita everywere-->
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Lobster&subset=latin,cyrillic"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<style>
|
||||
.title,
|
||||
h1,
|
||||
h2,
|
||||
h2 a,
|
||||
h3 {
|
||||
font-family: "Lobster";
|
||||
}
|
||||
</style>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title">Шпаргалка по git-flow</h1>
|
||||
|
||||
<p id="author">
|
||||
автор <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a
|
||||
href="https://twitter.com/share"
|
||||
class="twitter-share-button"
|
||||
data-via="0r1g4m14dd1c7"
|
||||
data-size="large"
|
||||
>Tweet</a
|
||||
>
|
||||
<script>
|
||||
!(function (d, s, id) {
|
||||
var js,
|
||||
fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
})(document, "script", "twitter-wjs");
|
||||
</script>
|
||||
</p>
|
||||
<p id="desc">
|
||||
ефективне розгалуження з допомогою git-flow від
|
||||
<a href="http://nvie.com/">Vincent Driessen</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
переклади: <a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
>
|
||||
- <a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="#" class="active" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>Вступ</h2>
|
||||
|
||||
<p>
|
||||
git-flow — це набір розширень git, який надає доступ до високорівневих
|
||||
операцій над репозиторієм згідно з моделлю розгалуження Vincent
|
||||
Driessen.
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>дізнатися більше</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Ця шпаргалка описує основні операції git-flow.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Загальні поради</h2>
|
||||
<ul>
|
||||
<li>
|
||||
Git-flow забезпечує чудову довідку і виведення в командному рядку.
|
||||
Читайте уважно, щоб розуміти, що відбувається...
|
||||
</li>
|
||||
<li>
|
||||
Клієнт для OSX/Windows
|
||||
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> — чудовий GUI
|
||||
для Git, який також підтримує git-flow
|
||||
</li>
|
||||
<li>
|
||||
Git-flow заснований на злитті. Для злиття гілок нововведень не
|
||||
використовується rebase.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Встановлення</a></h2>
|
||||
<ul>
|
||||
<li>Вам необхідний робочий інсталлятор git</li>
|
||||
<li>Git-flow працює на OSX, Linux та Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>Вам знадобиться wget і util-linux для встановлення git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Для більш детальної інформації щодо встановлення git-flow відвідайте
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
>git-flow wiki</a
|
||||
>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started">Початок роботи</a>
|
||||
</h2>
|
||||
<p>
|
||||
Git-flow порібно ініціалізувати, щоб налаштувати його для роботи з
|
||||
вашим репозиторієм.
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Ініціалізація</h3>
|
||||
|
||||
<p>
|
||||
Щоб почати використовувати git-flow, ініціалізуйте його в існуючому
|
||||
репозиторії:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
Дайте відповідь на запитання щодо назв ваших гілок.<br />
|
||||
Рекомендується залишити значення за замовчуванням.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Фічі</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Розробка нововведень для подальших релізів</li>
|
||||
<li>Зазвичай існує тільки в репозиторіях розробників</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Початок нововведення</h3>
|
||||
<p>
|
||||
Розробка нововведення починається з відгалуження гілки "develop".
|
||||
</p>
|
||||
<p>Для початку розробки нововведення виконайте:</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
Ця дія створить нову гілку нововведення, відгалужену від гілки
|
||||
"develop", і переключиться на неї.
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Завершення нововведення</h3>
|
||||
|
||||
<p>Завершення розробки нововведення. Ця дія виконується так:</p>
|
||||
<ul>
|
||||
<li>Злиття гілки MYFEATURE в "develop"</li>
|
||||
<li>Видалення гілки нововведення</li>
|
||||
<li>Переключення назад на гілку "develop"</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Публікація нововведення</h3>
|
||||
|
||||
<p>
|
||||
Ви розробляєте нововведення в команді? <br />
|
||||
Опубулікуйте нововведення на віддаленому сервері, щоб його могли
|
||||
використовувати інші користувачі.
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Отримання опублікованого нововведення</h3>
|
||||
|
||||
<p>Отримання нововведення, опублікованого іншим користувачем.</p>
|
||||
|
||||
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
|
||||
|
||||
<p>
|
||||
Ви можете відслідковувати нововведення в репозиторії origin з
|
||||
допомогою команди <code> git flow feature track MYFEATURE</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Створення релізу</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Забезпечується підготовка нового релізу продукту</li>
|
||||
<li>
|
||||
Дозволяє усунути дрібні помилки і підготувати різноманітні метадані
|
||||
для релізу
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Початок релізу</h3>
|
||||
|
||||
<p>
|
||||
Щоб почати роботу над релізом використовуйте команду
|
||||
<code>git flow release</code>
|
||||
Команда створить гілку релізу, відгалужуючись від гілки "develop".
|
||||
</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>
|
||||
За потреби ви можете вказати <code>[BASE]</code>-комміт у вигляді
|
||||
його хешу SHA-1, щоб почати реліз з нього. Цей комміт повинен
|
||||
належати гілці "develop".
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
Бажано одразу публікувати гілку релізу після створення, щоб інші
|
||||
користувачі мали змогу виконувати комміти в гілку релізу.
|
||||
Команда для публікації схожа на аналогічну команду для нововведень:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
Віддалений реліз також можна відслідковувати за допомогою команди
|
||||
<br /><code>git flow release track RELEASE</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Завершення релізу</h3>
|
||||
|
||||
<p>
|
||||
Завершення релізу - один з найбільших кроків в git-розгалуженні. Під
|
||||
час цього відбувається декілька дій:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Злиття гілки релізу в гілку "master"</li>
|
||||
<li>Позначення релізу ім'ям</li>
|
||||
<li>Злиття гілки релізу назад в гілку "develop"</li>
|
||||
<li>Видалення гілки релізу</li>
|
||||
</ul>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>
|
||||
Не забувайте відправляти зміни в тегах за допмогою команди
|
||||
<code>git push --tags</code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Виправлення</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Виправлення потрібні для усунення небажаного стану production-версії
|
||||
</li>
|
||||
<li>
|
||||
Може відгалужуватися від відповідного тегу на гілці "master", яким
|
||||
позначено випуск production-версії
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>
|
||||
Як і в випадку з іншими командами git-flow, робота над виправленнями
|
||||
починається так:
|
||||
</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>Аргумент VERSION визначає назву нового, виправленого релізу.</p>
|
||||
<p>
|
||||
За потреби можна вказати BASENAME-комміт, від якого піде
|
||||
відгалуження.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Завершення виправлення</h3>
|
||||
|
||||
<p>
|
||||
Коли виправлення завершене, воно зливається назад в гілки "develop"
|
||||
і "master". Крім того, комміт в гілці "master" позначється тегом з
|
||||
версією виправлення.
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Команди</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Останні зауваження</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Тут описані не всі доступні команди, а тільки найважливіші</li>
|
||||
<li>
|
||||
Ви можете продовжувати використовувати git і всі його команди,
|
||||
git-flow — це тільки набір додаткових інструментів
|
||||
</li>
|
||||
<li>
|
||||
Можливості "support"-гілок знаходяться в beta-версії, користуватися
|
||||
ними не рекомендується
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Коментарі</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>Будь ласка, увімкніть JavaScript, щоб переглянути
|
||||
<a href="http://disqus.com/?ref_noscript"
|
||||
>коментарі при підтримці Disqus.</a
|
||||
>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>коментарі при підтримці <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|
403
index.vi_VN.html
@ -1,403 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>Tóm tắt Git-Flow</title>
|
||||
<link href="https://fonts.googleapis.com/css?family=Baloo+Paaji|Lora&subset=latin-ext,vietnamese" rel="stylesheet">
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.vi_VN.css" type="text/css" media="screen,print">
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_gaq.push(['_trackPageview']);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement('script');
|
||||
ga.type = 'text/javascript';
|
||||
ga.async = true;
|
||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
||||
var s = document.getElementsByTagName('script')[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">Tóm tắt về Git-Flow</h1>
|
||||
|
||||
<p id="author">
|
||||
tác giả bài viết <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
|
||||
<script>!function (d, s, id) {
|
||||
var js, fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}
|
||||
}(document, "script", "twitter-wjs");</script>
|
||||
</p>
|
||||
<p id="desc">Phân nhánh tự động với công cụ git-flow của <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">các bản dịch khác:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="#" class="active" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>git-flow là gì?</h2>
|
||||
|
||||
<p>
|
||||
git-flow là một tiện ích mở rộng của git, giúp các thao tác trên repository (kho mã nguồn) trở nên dễ dàng và hiệu quả hơn dựa trên mô hình phân nhánh của Vincent Driessen.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">xem chi tết ở đây</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Bài tóm tắt nãy sẽ cho bạn biết các thao tác sử dụng cơ bản và sự hiệu quả của git-flow.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Một vài lời khuyên</h2>
|
||||
<ul>
|
||||
<li>Git-flow sẽ hỗ trợ thao tác và cho ra kết quả rất tuyệt vời. Hãy đọc bài viết này cẩn thận để xem điều kì diệu gì sẽ xảy ra ;)</li>
|
||||
<li>Git-client - <a href="http://www.sourcetreeapp.com/">Sourcetree</a> là một git-client có giao diện GUI rất tiện lợi và cũng hỗ trợ git-flow trên giao diện.</li>
|
||||
<li>Git-flow hoạt động dựa trên các thao tác gộp nhánh (merge). Nó không thực hiện các thao tác sắp xếp commits (rebase) trên các nhánh tính năng.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Cài đặt</a></h2>
|
||||
<ul>
|
||||
<li>Bạn cần cài đặt git trước khi có thể cài git-flow.</li>
|
||||
<li>Git-flow có thể hoạt động trên macOS, Linux và Windows.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Bạn cần wget và util-linux để cài đặt git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Xem chi tiết về cách cài đặt git-flow ở trang sau: <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git-flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Bắt đầu nào</a></h2>
|
||||
<p>Git flow cần phải được khởi tạo để có thể tùy chỉnh các cài đặt của dự án của bạn.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Khởi tạo</h3>
|
||||
|
||||
<p>Sau khi di chuyển tới thư mục dự án, chạy lệnh sau để khởi tạo git-flow.</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Bạn sẽ cần trả lời một số câu hỏi cho việc thiết lập git-flow sau câu lệnh khởi tạo.
|
||||
Chúng tôi khuyên bạn nên sử dụng các giá trị [mặc định].
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Làm việc với các chức năng</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Phát triển các chức năng mới cho lần phát hành kế tiếp.</li>
|
||||
<li>Về cơ bản việc này thường chỉ xảy ra ở kho mã nguồn (respository) của các lập trình viên.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Bắt đầu quá trình phát triển một chức năng mới</h3>
|
||||
<p>Để phát triển chức năng mới bạn nên bắt đầu từ nhánh phát triển 'develop'. Ví dụ với chức năng MYFEATURE:</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Lệnh này sẽ tạo ra một nhánh mới từ nhánh 'develop' và tự động chuyển sang nhánh mới này.</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Kết thúc quá trình phát triển một chức năng</h3>
|
||||
|
||||
<p>
|
||||
Điều này xảy ra sau khi bạn đã phát triển xong một chức năng (ví dụ phía trên là MYFEATURE), lệnh kết thúc quá trình phát triển chức năng sẽ tự động thực hiện các thao tác:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Gộp nhánh (merge branch) chức năng (MYFEATURE) vào nhánh 'develop'</li>
|
||||
<li>Xoá nhánh chức năng (MYFEATURE)</li>
|
||||
<li>Chuyển sang (checkout) nhánh 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Đẩy mã nguồn của chức năng lên máy chủ</h3>
|
||||
|
||||
<p>
|
||||
Khi bạn làm việc với những người khác trên cùng một chức năng,
|
||||
bạn sẽ cần đẩy (push) phần mã nguồn của bạn cho chức năng đó lên máy chủ (remote)
|
||||
để những người khác có thể kéo về (pull) được.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Kéo mã nguồn của chức năng xuống máy bạn</h3>
|
||||
|
||||
<p>
|
||||
Khi bạn cần kéo (pull) mã nguồn của chức năng về để phát triển tiếp sau khi nó đã được cập nhập bởi những thành viên khác (và họ đã đẩy nó lên máy chủ).
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull REMOTE_NAME MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Tạo một bản phát hành</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Hỗ trợ bạn chuẩn bị cho bản phát hành mới.</li>
|
||||
<li>Cho phép sửa các lỗi nhỏ và chuẩn bị các tài liệu cần thiết cho bản phát hành.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Bắt đầu một phát hành mới</h3>
|
||||
|
||||
<p>Để bắt đầu một phát hành mới, sử dụng lệnh release của git flow.</p>
|
||||
Lệnh này sẽ tạo ra nhánh 'release' từ nhánh 'develop'.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>Tùy chọn <code>[BASE]</code> cho phép commit được một giá trị hash sha-1. Trường hợp không chỉ định tùy chọn này thì HEAD sẽ được sử dụng.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Để công bố phần code 'release' của mình cho các thành viên khác, ta có thể làm tương tự như với công bố tính năng bằng lệnh sau:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(Bạn có thể theo dấu remote 'release' bằng lệnh <br/><code>git flow release track RELEASE</code> )</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Kết thúc release</h3>
|
||||
|
||||
<p>Kết thúc release là một bước lớn trong chiến lược phân nhánh git. Nó thực hiện các việc sau:</p>
|
||||
<ul>
|
||||
<li>Merge nhánh 'release' vào nhánh 'master'</li>
|
||||
<li>Gắn tag ở nhánh 'master' dành cho bản release</li>
|
||||
<li>Merge lại nhánh 'release' vào nhánh 'develop'</li>
|
||||
<li>Xóa bỏ nhánh 'release'</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Sửa đổi nóng - hotfix</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Sử dụng cho các trường hợp khẩn cấp cần phải sửa đổi ngay trên bản sản phẩm (nhánh master).</li>
|
||||
<li>Có thể tạo nhánh giải quyết khẩn cấp từ tag của nhánh 'master'.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Bắt đầu hotfix</h3>
|
||||
|
||||
<p>Giống như các lệnh khác của git flow, hotfix bắt đầu với:</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>Tham số VERSION ở đây chỉ định tên của phiên bản release hotfix này. Còn tham số tùy chọn basename sẽ chỉ định tên nhánh cơ bản thay cho hotfix thay vì nhánh 'master'</p>
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Kết thúc hotfix</h3>
|
||||
|
||||
<p>Kết thúc hotfix sẽ merge lại nội dung thay đổi vào nhánh 'develop' và 'master'. Ở nhánh 'master' sẽ được gắn tag là phiên bản của hotfix.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Các lệnh</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Lưu ý</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Ở đây không giới thiệu được tất cả các lệnh mà chỉ đưa ra một số lệnh quan trọng nhất của git-flow.</li>
|
||||
<li>Tất nhiên là bạn vẫn có thể sử dụng toàn bộ các lệnh thông thường của git. Git-flow chỉ đơn giản là một tập hợp các lệnh mở rộng cho git.</li>
|
||||
<li>Chức năng nhánh 'support' vẫn đang là bản beta nên không được đề cập ở đây.</li>
|
||||
<li>Tôi rất sẵn sàng tích hợp bất kì bản dịch nào nếu bạn sẵn lòng :)</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Bình luận</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement('script');
|
||||
dsq.type = 'text/javascript';
|
||||
dsq.async = true;
|
||||
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
376
index.zh_CN.html
@ -1,376 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow 备忘清单</title>
|
||||
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_gaq.push(['_trackPageview']);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement('script');
|
||||
ga.type = 'text/javascript';
|
||||
ga.async = true;
|
||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
||||
var s = document.getElementsByTagName('script')[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title" style="font-size: 80px;">git-flow 备忘清单</h1>
|
||||
|
||||
<p id="author">
|
||||
由 <a href="http://twitter.com/0r1g4m14dd1c7" target="_blank">Daniel Kummer (<a href="https://twitter.com/share" data-size="large">Tweet</a>)</a> 创建
|
||||
|
||||
</p>
|
||||
<p id="desc">使用 git-flow 进行有效的分支实践。 by <a href="http://nvie.com/" target="_blank">Vincent Driessen</a></p>
|
||||
<p id="translations">翻译:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="#" class="active" title="Simplified Chinese">简体中文(Simplified Chinese)</a>
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>关于</h2>
|
||||
|
||||
<p>
|
||||
git-flow 是一个 git 扩展集,按 Vincent Driessen 的分支模型提供高层次的库操作。
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">查看详情</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>这个备忘清单展示了 git-flow 的基本操作和效果。</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>基础建议</h2>
|
||||
<ul>
|
||||
<li>Git flow 提供了极出色的命令帮忙以及输出提示。请仔细阅读并观察发生了什么事情...</li>
|
||||
<li>macOS 程序 <a href="http://www.sourcetreeapp.com/">Sourcetree</a> 是一个极出色的 git 界面客户端,已经提供了 git-flow 的支持。 </li>
|
||||
<li>- Git-flow 是一个基于归并的解决方案,它并没有提供重置(rebase)特性分支的能力。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">安装</a></h2>
|
||||
<ul>
|
||||
<li>你需要有一个可以工作的 git 作为前提。 </li>
|
||||
<li>Git flow 可以工作在 macOS, Linux 和 Windows之下</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>macOS</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>安装 git-flow, 你需要 wget 和 util-linux。</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
更多的 git flow 安装指引,请阅读 <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation" target="_blank">git flow wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">开始</a></h2>
|
||||
<p>为了自定义你的项目,Git flow 需要初始化过程。</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>初始化</h3>
|
||||
|
||||
<p>使用 git-flow,从初始化一个现有的 git 库内开始:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
你必须回答几个关于分支的命名约定的问题。<br/>建议使用默认值。
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">特性</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>为即将发布的版本开发新功能特性。</li>
|
||||
<li>这通常只存在开发者的库中。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>增加新特性</h3>
|
||||
<p>新特性的开发是基于 'develop' 分支的。</p>
|
||||
<p>通过下面的命令开始开发新特性:</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>这个操作创建了一个基于'develop'的特性分支,并切换到这个分支之下。</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>完成新特性</h3>
|
||||
|
||||
<p>完成开发新特性。这个动作执行下面的操作.
|
||||
</p>
|
||||
<ul>
|
||||
<li>合并 MYFEATURE 分支到 'develop'</li>
|
||||
<li>删除这个新特性分支</li>
|
||||
<li>切换回 'develop' 分支</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>发布新特性</h3>
|
||||
|
||||
<p>
|
||||
你是否合作开发一项新特性?<br/>
|
||||
发布新特性分支到远程服务器,所以,其它用户也可以使用这分支。
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>取得一个发布的新特性分支</h3>
|
||||
|
||||
<p>
|
||||
取得其它用户发布的新特性分支,并签出远程的变更。
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>你可以使用 <code> git flow feature track MYFEATURE</code> 跟踪在origin上的特性分支。</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">作一个release版本</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>支持一个新的用于生产环境的发布版本。 </li>
|
||||
<li>允许修正小问题,并为发布版本准备元数据。 </li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>开始准备release版本</h3>
|
||||
|
||||
<p>开始准备release版本,使用 git flow release 命令. </p>
|
||||
它从 'develop' 分支开始创建一个 release 分支。
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p> 你可以选择提供一个 <code>[BASE]</code>参数,即提交记录的 sha-1 hash 值,来开启动 release 分支. 这个提交记录的 sha-1 hash 值必须是'develop' 分支下的。</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>创建 release 分支之后立即发布允许其它用户向这个 release 分支提交内容是个明智的做法。命令十分类似发布新特性:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(你可以通过 <br/><code>git flow release track RELEASE</code> 命令签出 release 版本的远程变更)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>完成 release 版本</h3>
|
||||
|
||||
<p>完成 release 版本是一个大 git 分支操作。它执行下面几个动作: </p>
|
||||
<ul>
|
||||
<li>归并 release 分支到 'master' 分支</li>
|
||||
<li>用 release 分支名打 Tag</li>
|
||||
<li>归并 release 分支到 'develop'</li>
|
||||
<li>移除 release 分支</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">紧急修复</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>紧急修复来自这样的需求:生产环境的版本处于一个不预期状态,需要立即修正。 </li>
|
||||
<li> 有可能是需要修正 master 分支上某个 TAG 标记的生产版本。 </li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>开始 git flow 紧急修复</h3>
|
||||
|
||||
<p>像其它 git flow 命令一样, 紧急修复分支开始自:</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p> VERSION 参数标记着修正版本。你可以从 [BASENAME]开始,<code>[BASENAME]</code>为finish release时填写的版本号</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>完成紧急修复</h3>
|
||||
|
||||
<p>当完成紧急修复分支,代码归并回 develop 和 master 分支。相应地,master 分支打上修正版本的 TAG。</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">命令</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>并非所有可用的命令都涵盖在这里,这里包含有最重要的部分命令。 </li>
|
||||
<li>你依旧可以继续使用你所知道和了解的 git 命令, git flow 只是一个工具集合。</li>
|
||||
<li>'support' 功能只是测试版本, 不建议使用</li>
|
||||
<li>如果你乐意提供翻译,我很乐意整合它。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comments</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement('script');
|
||||
dsq.type = 'text/javascript';
|
||||
dsq.async = true;
|
||||
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
</body>
|
||||
</html>
|
460
index.zh_TW.html
@ -1,460 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-TW">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="x-ua-compatible" content="ie=edge" />
|
||||
<title>git-flow 備忘清單</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Sansita+One"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/normalize.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="css/style.zh_TW.css"
|
||||
type="text/css"
|
||||
media="screen,print"
|
||||
/>
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(["_setAccount", "UA-33766650-1"]);
|
||||
_gaq.push(["_trackPageview"]);
|
||||
|
||||
(function () {
|
||||
var ga = document.createElement("script");
|
||||
ga.type = "text/javascript";
|
||||
ga.async = true;
|
||||
ga.src =
|
||||
("https:" == document.location.protocol
|
||||
? "https://ssl"
|
||||
: "http://www") + ".google-analytics.com/ga.js";
|
||||
var s = document.getElementsByTagName("script")[0];
|
||||
s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner">
|
||||
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
|
||||
>Fork me on GitHub</a
|
||||
>
|
||||
</div>
|
||||
<header>
|
||||
<h1 id="title" style="font-size: 80px">git-flow 備忘清單</h1>
|
||||
|
||||
<p id="author">
|
||||
由
|
||||
<a href="http://twitter.com/0r1g4m14dd1c7" target="_blank"
|
||||
>Daniel Kummer (<a href="https://twitter.com/share" data-size="large"
|
||||
>Tweet</a
|
||||
>)</a
|
||||
>
|
||||
建立
|
||||
</p>
|
||||
<p id="desc">
|
||||
使用 git-flow 進行高效率的分支使用。 by
|
||||
<a href="http://nvie.com/" target="_blank">Vincent Driessen</a>
|
||||
</p>
|
||||
<p id="translations">
|
||||
翻譯: <a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues"
|
||||
>Brazilian Portugues</a
|
||||
>
|
||||
-
|
||||
<a href="#" class="active" title="Traditional Chinese"
|
||||
>繁體中文(Traditional Chinese)</a
|
||||
>
|
||||
-
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese"
|
||||
>简体中文(Simplified Chinese)</a
|
||||
><br />
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
|
||||
-
|
||||
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
|
||||
-
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt"
|
||||
>Tiếng Việt (Vietnamese)</a
|
||||
>
|
||||
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.ar_MA.html" title="العربية">العربية</a> -
|
||||
<a href="index.fa_FA.html" title="فارسی">فارسی</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
<div class="scrollblock">
|
||||
<h2>什麼是 git-flow ?</h2>
|
||||
|
||||
<p>
|
||||
git-flow 是一個 git 擴充功能,依照 Vincent Driessen
|
||||
的分支模型提供高層次的倉庫控制方式。
|
||||
<small
|
||||
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
|
||||
>查看更多</a
|
||||
></small
|
||||
>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>這個備忘清單將會為您展示 git-flow 的基本操作方式與結果。</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>基礎提示</h2>
|
||||
<ul>
|
||||
<li>
|
||||
git-flow
|
||||
提供了極為出色的指令與輸出提示。請仔細閱讀並觀察發生了什麼事情...
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://www.sourcetreeapp.com/">SourceTree</a>
|
||||
是一個極為出色的 git 圖形介面應用程式,以內建了 git-flow
|
||||
的功能。(支援 Mac OS X 與 Windows)
|
||||
</li>
|
||||
<li>
|
||||
git-flow
|
||||
是一個以合並(Merge)概念為基底的解決方案,它並無提供重置(rebase)特性分支的功能。
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">安裝</a></h2>
|
||||
<ul>
|
||||
<li>你需要有一個已經初始化的 git 倉庫。</li>
|
||||
<li>git-flow 可以在 macOS、Linux 和 Windows 之下使用。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Mac OS X</h3>
|
||||
<span>透過 Homebrew 安裝</span>
|
||||
<blockquote>$ brew install git-flow-avh</blockquote>
|
||||
<span>透過 Macports 安裝</span>
|
||||
<blockquote>$ port install git-flow-avh</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>$ apt-get install git-flow</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
|
||||
install stable | bash
|
||||
</blockquote>
|
||||
<p>在 Windows 下安装 git-flow, 你會需要 wget 和 util-linux。</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
更詳細的 git-flow 安裝指南,請參閱
|
||||
<a
|
||||
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
|
||||
target="_blank"
|
||||
>git flow wiki</a
|
||||
>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>
|
||||
<a name="getting_started" href="#getting_started">開始 git-flow</a>
|
||||
</h2>
|
||||
<p>在開始使用 git-flow 之前,你必須完成一些簡單的設定。</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>初始化</h3>
|
||||
|
||||
<p>
|
||||
開始使用 git-flow 前,你必須切換目錄至你的 git
|
||||
專案中,並且以下列指令進行初始化:
|
||||
</p>
|
||||
<blockquote>git flow init</blockquote>
|
||||
<p>
|
||||
接著您必須回答幾個問題,是關於分支名稱的定義。<br />這裡建議使用預設值。
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">新功能分支(Feature)</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>為接下即將發佈的版本開發新功能時使用。</li>
|
||||
<li>通常新功能分支只會存於開發者機器上。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>開始新功能設計</h3>
|
||||
<p>新功能的開發是由 'develop' 分支的最後一個版本發展出來的。</p>
|
||||
<p>使用下列的命令可以開始一個新功能的分支:</p>
|
||||
<blockquote>git flow feature start MYFEATURE</blockquote>
|
||||
<p>
|
||||
這個命令將會於 'develop' 的最後一個版本建立出另一個
|
||||
'feature/MYFEATURE'
|
||||
分支,並自動切換至這個分支底下。現在你可以開始製作新功能。
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>完成新功能</h3>
|
||||
|
||||
<p>當你在新功能分支完成新功能後,使用下列指令來結束新功能開發:</p>
|
||||
<blockquote>git flow feature finish MYFEATURE</blockquote>
|
||||
<p>這個指令會替你完成下列動作:</p>
|
||||
<ul>
|
||||
<li>合並(Merge) MYFEATURE 分支回到 'develop'</li>
|
||||
<li>刪除這個新功能分支</li>
|
||||
<li>切換回 'develop' 分支</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>發佈新功能分支</h3>
|
||||
|
||||
<p>
|
||||
你是否需多人合作開發新功能?<br />
|
||||
透過下列命令來發佈新功能分支到遠端 git
|
||||
伺服器,讓其他使用者也能共用這個新功能分支。
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature publish MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>取得新功能分支</h3>
|
||||
|
||||
<p>
|
||||
當你需接手完成新功能時,透過下列命令取得遠端伺服器上的新功能分支,並得到所有保存在遠端伺服器上的變更紀錄:
|
||||
</p>
|
||||
|
||||
<blockquote>git flow feature pull MYFEATURE</blockquote>
|
||||
|
||||
<p>你也可以透過下列指令進而追蹤一個功能:</p>
|
||||
|
||||
<blockquote>git flow feature track MYFEATURE</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">製作發佈版本(release)</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>用於支援準備發佈正式產品前的預備分支。</li>
|
||||
<li>允許修正小問題,並為發布版本準備或修改中介資料。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>開始推出新版本</h3>
|
||||
|
||||
<p>使用下列指令準備推出(release)新版本分支:</p>
|
||||
<blockquote>git flow release start RELEASE [BASE]</blockquote>
|
||||
<p>它會從 'develop' 分支的最後一個版本創建出 release 分支。</p>
|
||||
<p>
|
||||
你也可以選擇性的加入一個 sha-1 hash
|
||||
於<code>[BASE]</code>參數,這會讓 release 分支於您指定的 develop
|
||||
提交紀錄點產生分支。有一點需要注意的是,sha-1 hash 只能是於'develop'
|
||||
分支下。
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>
|
||||
最佳的狀況下,在創建出新的 release
|
||||
分支後,應要立即的發布至遠端伺服器上,讓其他團隊中的開發者也能存取這個
|
||||
release 分支。而這個發布指令很類似於發布新功能:
|
||||
</p>
|
||||
<blockquote>git flow release publish RELEASE</blockquote>
|
||||
<p>
|
||||
(您也可以透過 <br /><code>git flow release track RELEASE</code>
|
||||
指令來取得 release 版本的遠端更改)
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>完成推出新版本</h3>
|
||||
|
||||
<p>
|
||||
完成 release 版本是一個很大的 git 分支操作。但你只許要執行下列指令:
|
||||
</p>
|
||||
<blockquote>git flow release finish RELEASE</blockquote>
|
||||
<p>git flow 會幫你執行下面幾個步驟:</p>
|
||||
<ul>
|
||||
<li>合並 release 分支到 'master'</li>
|
||||
<li>在 master 加上版本號標籤<small>(Tag)</small></li>
|
||||
<li>合並 release 分支到 'develop'</li>
|
||||
<li>移除 release 分支</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">快速修復(hotfix)</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
當你的產品發佈環境處於不可預期的狀況,且發生了一些需要立即修正的問題,您可以使用
|
||||
hotfix 來幫助您。
|
||||
</li>
|
||||
<li>hotfix 是從 master 中加入的版本標籤開始。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>開始快速修復</h3>
|
||||
|
||||
<p>
|
||||
快速修復(hotfix)就像其他的 git flow
|
||||
指令一樣,您可以透過下列指令開始:
|
||||
</p>
|
||||
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
|
||||
<p>
|
||||
你必須填寫一個 VERSION 參數,這代表當你完成 hotfix
|
||||
時發佈的版本號碼。
|
||||
</p>
|
||||
<p>
|
||||
此外你可以自由挑選修復開始的分支名稱<code>[BASENAME]</code>,分支名稱如果不填寫的狀況下,預設是
|
||||
'master'。
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>完成快速修復</h3>
|
||||
|
||||
<p>
|
||||
當你在快速修復分支完成修復後,透過下列的指令讓修復分支合並回 develop
|
||||
和 master 分支。並且在 master 分支加上修訂版本號的標籤(tag):
|
||||
</p>
|
||||
<blockquote>git flow hotfix finish VERSION</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">指令一覽圖</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands" />
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>備註</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>這裡我們只介紹了重要且常用的功能,並非包含所有的指令。</li>
|
||||
<li>
|
||||
git-flow 只是一個額外的擴充功能,即使安裝了 git-flow
|
||||
後你依然可以使用你所知道的原生 git 指令。
|
||||
</li>
|
||||
<li>'support' 分支目前為測試版本不建議使用。</li>
|
||||
<li>如果你很樂意提供翻譯,我很樂意整合。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">建議與回應</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
|
||||
|
||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
||||
(function () {
|
||||
var dsq = document.createElement("script");
|
||||
dsq.type = "text/javascript";
|
||||
dsq.async = true;
|
||||
dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
|
||||
(
|
||||
document.getElementsByTagName("head")[0] ||
|
||||
document.getElementsByTagName("body")[0]
|
||||
).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript
|
||||
>請允許你的瀏覽器使用 JavaScript 才能看得到<a
|
||||
href="http://disqus.com/?ref_noscript"
|
||||
>建議與回應 powered by Disqus.</a
|
||||
>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink"
|
||||
>comments powered by <span class="logo-disqus">Disqus</span></a
|
||||
>
|
||||
</body>
|
||||
</html>
|