mirror of
https://github.com/danielkummer/git-flow-cheatsheet.git
synced 2024-11-22 07:54:03 +01:00
Removed obsolete jQuery request
This commit is contained in:
Ottnorml
Simon Potye
parent
473922e745
commit
9b5665c668
@ -9,7 +9,6 @@
|
|||||||
<link rel="stylesheet" href="css/style.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">
|
<link rel="stylesheet" href="css/style.ar_MA.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -9,7 +9,6 @@
|
|||||||
<link rel="stylesheet" href="css/style.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">
|
<link rel="stylesheet" href="css/style.ca_CA.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
<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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
<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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
<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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
<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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
817
index.hr_HR.html
817
index.hr_HR.html
@ -1,409 +1,408 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||||
<title>git-flow cheatsheet</title>
|
<title>git-flow cheatsheet</title>
|
||||||
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
<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/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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
<script type="text/javascript">
|
||||||
<script type="text/javascript">
|
var _gaq = _gaq || [];
|
||||||
var _gaq = _gaq || [];
|
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
_gaq.push(['_trackPageview']);
|
||||||
_gaq.push(['_trackPageview']);
|
|
||||||
|
(function () {
|
||||||
(function () {
|
var ga = document.createElement('script');
|
||||||
var ga = document.createElement('script');
|
ga.type = 'text/javascript';
|
||||||
ga.type = 'text/javascript';
|
ga.async = true;
|
||||||
ga.async = true;
|
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
||||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
var s = document.getElementsByTagName('script')[0];
|
||||||
var s = document.getElementsByTagName('script')[0];
|
s.parentNode.insertBefore(ga, s);
|
||||||
s.parentNode.insertBefore(ga, s);
|
})();
|
||||||
})();
|
</script>
|
||||||
</script>
|
</head>
|
||||||
</head>
|
<body>
|
||||||
<body>
|
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
<header>
|
||||||
<header>
|
|
||||||
|
<h1 id="title">git-flow šalabahter</h1>
|
||||||
<h1 id="title">git-flow šalabahter</h1>
|
|
||||||
|
<p id="author">
|
||||||
<p id="author">
|
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||||
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>
|
||||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
|
<script>!function (d, s, id) {
|
||||||
<script>!function (d, s, id) {
|
var js, fjs = d.getElementsByTagName(s)[0];
|
||||||
var js, fjs = d.getElementsByTagName(s)[0];
|
if (!d.getElementById(id)) {
|
||||||
if (!d.getElementById(id)) {
|
js = d.createElement(s);
|
||||||
js = d.createElement(s);
|
js.id = id;
|
||||||
js.id = id;
|
js.src = "//platform.twitter.com/widgets.js";
|
||||||
js.src = "//platform.twitter.com/widgets.js";
|
fjs.parentNode.insertBefore(js, fjs);
|
||||||
fjs.parentNode.insertBefore(js, fjs);
|
}
|
||||||
}
|
}(document, "script", "twitter-wjs");</script>
|
||||||
}(document, "script", "twitter-wjs");</script>
|
</p>
|
||||||
</p>
|
<p id="desc">efikasno branchanje koristeći git-flow <a href="http://nvie.com/">Vincenta Driessena</a></p>
|
||||||
<p id="desc">efikasno branchanje koristeći git-flow <a href="http://nvie.com/">Vincenta Driessena</a></p>
|
<p id="translations">prijevodi:
|
||||||
<p id="translations">prijevodi:
|
<a href="#" class="active" title="english">English</a> -
|
||||||
<a href="#" class="active" title="english">English</a> -
|
<a href="index.es_ES.html" title="spanish">Castellano</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.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_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified 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.ja_JP.html" title="日本語">日本語</a> -
|
<a href="index.tr_TR.html" title="Turkce">Türkçe</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.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
|
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</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.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.pl_PL.html" title="Polish">Polski</a> -
|
<a href="index.hr_HR.html" title="Croatian">Hrvatski</a> -
|
||||||
<a href="index.hr_HR.html" title="Croatian">Hrvatski</a> -
|
<a href="index.ar_MA.html" title="العربية">العربية</a>
|
||||||
<a href="index.ar_MA.html" title="العربية">العربية</a>
|
</p>
|
||||||
</p>
|
</header>
|
||||||
</header>
|
|
||||||
|
<div id="main">
|
||||||
<div id="main">
|
|
||||||
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<h2>O git-flowu</h2>
|
||||||
<h2>O git-flowu</h2>
|
|
||||||
|
<p>
|
||||||
<p>
|
git-flow je skup ekstenzija koje omogućuju da se operacije na repozitoriju, koje implementiraju
|
||||||
git-flow je skup ekstenzija koje omogućuju da se operacije na repozitoriju, koje implementiraju
|
branching model Vincenta Driessena, obavljaju lakše.
|
||||||
branching model Vincenta Driessena, obavljaju lakše.
|
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small>
|
||||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small>
|
</p>
|
||||||
</p>
|
<p class="divider">★ ★ ★</p>
|
||||||
<p class="divider">★ ★ ★</p>
|
|
||||||
|
<p>Ovaj šalabahter prikazuje osnovnu uporabu i efekte git-flow operacija</p>
|
||||||
<p>Ovaj šalabahter prikazuje osnovnu uporabu i efekte git-flow operacija</p>
|
|
||||||
|
<p class="divider">★ ★ ★</p>
|
||||||
<p class="divider">★ ★ ★</p>
|
</div>
|
||||||
</div>
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<h2>Osnovni savjeti</h2>
|
||||||
<h2>Osnovni savjeti</h2>
|
<ul>
|
||||||
<ul>
|
<li>Git flow ima izvrsnu pomoć i izlaz na komandnoj liniji. Pažljivo čitajte da vidite što se događa...</li>
|
||||||
<li>Git flow ima izvrsnu pomoć i izlaz na komandnoj liniji. Pažljivo čitajte da vidite što se događa...</li>
|
<li>OSX/Windows klijent <a href="http://www.sourcetreeapp.com/">Sourcetree</a> je izvrstan GUI alat za git koji nudi
|
||||||
<li>OSX/Windows klijent <a href="http://www.sourcetreeapp.com/">Sourcetree</a> je izvrstan GUI alat za git koji nudi
|
podršku i za git-flow.
|
||||||
podršku i za git-flow.
|
</li>
|
||||||
</li>
|
<li>Git-flow je rješenje zasnovano na mergeovima. Ne vrši se rebase brancheva sa novim razvijenim funkcionalnostima.</li>
|
||||||
<li>Git-flow je rješenje zasnovano na mergeovima. Ne vrši se rebase brancheva sa novim razvijenim funkcionalnostima.</li>
|
</ul>
|
||||||
</ul>
|
<p class="divider">★ ★ ★</p>
|
||||||
<p class="divider">★ ★ ★</p>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<h2><a name="setup" href="#setup">Postavljanje</a></h2>
|
||||||
<h2><a name="setup" href="#setup">Postavljanje</a></h2>
|
<ul>
|
||||||
<ul>
|
<li>Potrebna je funkcionirajuća git instalacaija.</li>
|
||||||
<li>Potrebna je funkcionirajuća git instalacaija.</li>
|
<li>Git flow radni na OS X, Linuxu i Windowsima</li>
|
||||||
<li>Git flow radni na OS X, Linuxu i Windowsima</li>
|
</ul>
|
||||||
</ul>
|
<p class="divider">★ ★ ★</p>
|
||||||
<p class="divider">★ ★ ★</p>
|
<div class="col-1">
|
||||||
<div class="col-1">
|
<h3>OSX</h3>
|
||||||
<h3>OSX</h3>
|
<span>Homebrew</span>
|
||||||
<span>Homebrew</span>
|
<blockquote>
|
||||||
<blockquote>
|
$ brew install git-flow-avh
|
||||||
$ brew install git-flow-avh
|
</blockquote>
|
||||||
</blockquote>
|
<span>Macports</span>
|
||||||
<span>Macports</span>
|
<blockquote>
|
||||||
<blockquote>
|
$ port install git-flow-avh
|
||||||
$ port install git-flow-avh
|
</blockquote>
|
||||||
</blockquote>
|
<h3>Linux</h3>
|
||||||
<h3>Linux</h3>
|
<blockquote>
|
||||||
<blockquote>
|
$ apt-get install git-flow
|
||||||
$ apt-get install git-flow
|
</blockquote>
|
||||||
</blockquote>
|
<h3>Windows (Cygwin)</h3>
|
||||||
<h3>Windows (Cygwin)</h3>
|
<blockquote>
|
||||||
<blockquote>
|
$ wget -q -O - --no-check-certificate
|
||||||
$ wget -q -O - --no-check-certificate
|
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
</blockquote>
|
||||||
</blockquote>
|
<p>Trebate wget i util-linux za instaliranje git-flow.</p>
|
||||||
<p>Trebate wget i util-linux za instaliranje git-flow.</p>
|
</div>
|
||||||
</div>
|
<div class="col-2">
|
||||||
<div class="col-2">
|
<p>
|
||||||
<p>
|
Za detaljne instalacijske upute posjetite <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||||
Za detaljne instalacijske upute posjetite <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
wiki</a>.
|
||||||
wiki</a>.
|
</p>
|
||||||
</p>
|
<img src="img/download.png" alt="install git-flow"/>
|
||||||
<img src="img/download.png" alt="install git-flow"/>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<h2><a name="getting_started" href="#getting_started">Osnove</a></h2>
|
||||||
<h2><a name="getting_started" href="#getting_started">Osnove</a></h2>
|
<p>Git flow je potrebno inicijalizirati da prilagodite postavke svog projekta.</p>
|
||||||
<p>Git flow je potrebno inicijalizirati da prilagodite postavke svog projekta.</p>
|
<p class="divider">★ ★ ★</p>
|
||||||
<p class="divider">★ ★ ★</p>
|
<div class="col-1">
|
||||||
<div class="col-1">
|
<h3>Inicijalizacija</h3>
|
||||||
<h3>Inicijalizacija</h3>
|
|
||||||
|
<p>Započnite sa git-flow inicijalizancijom istog u postojećem git repozitoriju:</p>
|
||||||
<p>Započnite sa git-flow inicijalizancijom istog u postojećem git repozitoriju:</p>
|
<blockquote>
|
||||||
<blockquote>
|
git flow init
|
||||||
git flow init
|
</blockquote>
|
||||||
</blockquote>
|
<p>
|
||||||
<p>
|
Potrebno je odgovoriti na par pitanja vezano uz konvencije imenovanja brancheva.<br/>
|
||||||
Potrebno je odgovoriti na par pitanja vezano uz konvencije imenovanja brancheva.<br/>
|
Preporučuje se upotreba pretpostavljenih vrijednosti.
|
||||||
Preporučuje se upotreba pretpostavljenih vrijednosti.
|
</p>
|
||||||
</p>
|
|
||||||
|
</div>
|
||||||
</div>
|
<div class="col-2">
|
||||||
<div class="col-2">
|
<div class="initialize"></div>
|
||||||
<div class="initialize"></div>
|
<div class="lines-small"></div>
|
||||||
<div class="lines-small"></div>
|
<div class="lines-open"></div>
|
||||||
<div class="lines-open"></div>
|
<div class="lines-big"></div>
|
||||||
<div class="lines-big"></div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<h2><a name="features" href="#features">Funkcionalnosti</a></h2>
|
||||||
<h2><a name="features" href="#features">Funkcionalnosti</a></h2>
|
|
||||||
|
<ul class="narrow">
|
||||||
<ul class="narrow">
|
<li>Razvoj novih funkcionalnosti za naredne releasove</li>
|
||||||
<li>Razvoj novih funkcionalnosti za naredne releasove</li>
|
<li>Tipično se nalaze samo u lokalnom repozitoriju</li>
|
||||||
<li>Tipično se nalaze samo u lokalnom repozitoriju</li>
|
</ul>
|
||||||
</ul>
|
<p class="divider">★ ★ ★</p>
|
||||||
<p class="divider">★ ★ ★</p>
|
|
||||||
|
<div class="col-1">
|
||||||
<div class="col-1">
|
<h3>Početak nove funkcionalnosti</h3>
|
||||||
<h3>Početak nove funkcionalnosti</h3>
|
<p>Nove funkcionalnost započinju se iz 'develop' brancha.</p>
|
||||||
<p>Nove funkcionalnost započinju se iz 'develop' brancha.</p>
|
<p>Otpočnite razvoj nove funkcionalnosti sa:</p>
|
||||||
<p>Otpočnite razvoj nove funkcionalnosti sa:</p>
|
<blockquote>
|
||||||
<blockquote>
|
git flow feature start MYFEATURE
|
||||||
git flow feature start MYFEATURE
|
</blockquote>
|
||||||
</blockquote>
|
<p>Ova akcija kreira branch za novu funkcionalnost baziran na 'develop' i prebacuje u njega</p>
|
||||||
<p>Ova akcija kreira branch za novu funkcionalnost baziran na 'develop' i prebacuje u njega</p>
|
|
||||||
|
<!--
|
||||||
<!--
|
- Bump the version number now!
|
||||||
- Bump the version number now!
|
- Start committing last-minute fixes in preparing your release
|
||||||
- Start committing last-minute fixes in preparing your release
|
- When done, run:
|
||||||
- When done, run:
|
|
||||||
|
git flow release finish 'testrelease'
|
||||||
git flow release finish 'testrelease'
|
|
||||||
|
|
||||||
|
|
||||||
|
-->
|
||||||
-->
|
</div>
|
||||||
</div>
|
<div class="col-2">
|
||||||
<div class="col-2">
|
<div class="feature-start"></div>
|
||||||
<div class="feature-start"></div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<div class="col-1">
|
||||||
<div class="col-1">
|
<h3>Dovršavanje funkcionalnosti</h3>
|
||||||
<h3>Dovršavanje funkcionalnosti</h3>
|
|
||||||
|
<p>
|
||||||
<p>
|
Dovršite razvoj nove funkcionalnosti.
|
||||||
Dovršite razvoj nove funkcionalnosti.
|
Ova akcija izvršava sljedeće
|
||||||
Ova akcija izvršava sljedeće
|
</p>
|
||||||
</p>
|
<ul>
|
||||||
<ul>
|
<li>Mergea MYFEATURE u 'develop'</li>
|
||||||
<li>Mergea MYFEATURE u 'develop'</li>
|
<li>Uklanja branch funkcionalnosti</li>
|
||||||
<li>Uklanja branch funkcionalnosti</li>
|
<li>Prebacuje natrag u 'develop' branch</li>
|
||||||
<li>Prebacuje natrag u 'develop' branch</li>
|
</ul>
|
||||||
</ul>
|
|
||||||
|
<blockquote>
|
||||||
<blockquote>
|
git flow feature finish MYFEATURE
|
||||||
git flow feature finish MYFEATURE
|
</blockquote>
|
||||||
</blockquote>
|
</div>
|
||||||
</div>
|
<div class="col-2">
|
||||||
<div class="col-2">
|
<div class="feature-end"></div>
|
||||||
<div class="feature-end"></div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<div class="col-1">
|
||||||
<div class="col-1">
|
<h3>Publiciranje funkcionalnosti</h3>
|
||||||
<h3>Publiciranje funkcionalnosti</h3>
|
|
||||||
|
<p>
|
||||||
<p>
|
Razvijate li funkcionalnost zajedno s nekim? <br/>
|
||||||
Razvijate li funkcionalnost zajedno s nekim? <br/>
|
Publicirajte funkcionalnost na udaljeni server tako da ju mogu koristiti drugi korisnici.
|
||||||
Publicirajte funkcionalnost na udaljeni server tako da ju mogu koristiti drugi korisnici.
|
</p>
|
||||||
</p>
|
|
||||||
|
<blockquote>
|
||||||
<blockquote>
|
git flow feature publish MYFEATURE
|
||||||
git flow feature publish MYFEATURE
|
</blockquote>
|
||||||
</blockquote>
|
</div>
|
||||||
</div>
|
<div class="col-2">
|
||||||
<div class="col-2">
|
<div class="feature-publish"></div>
|
||||||
<div class="feature-publish"></div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<div class="col-1">
|
||||||
<div class="col-1">
|
<h3>Preuzimanje publicirane funkcionalnosti</h3>
|
||||||
<h3>Preuzimanje publicirane funkcionalnosti</h3>
|
|
||||||
|
<p>
|
||||||
<p>
|
Preuzmite funkcionalnost koju je netko razvio.
|
||||||
Preuzmite funkcionalnost koju je netko razvio.
|
</p>
|
||||||
</p>
|
|
||||||
|
<blockquote>
|
||||||
<blockquote>
|
git flow feature pull origin MYFEATURE
|
||||||
git flow feature pull origin MYFEATURE
|
</blockquote>
|
||||||
</blockquote>
|
|
||||||
|
<p>Možete pratiti razvoj funkcionalnost sa: <code> git flow feature track MYFEATURE</code> </p>
|
||||||
<p>Možete pratiti razvoj funkcionalnost sa: <code> git flow feature track MYFEATURE</code> </p>
|
</div>
|
||||||
</div>
|
<div class="col-2">
|
||||||
<div class="col-2">
|
<div class="feature-pull"></div>
|
||||||
<div class="feature-pull"></div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<h2><a name="release" href="#release">Release</a></h2>
|
||||||
<h2><a name="release" href="#release">Release</a></h2>
|
|
||||||
|
<ul>
|
||||||
<ul>
|
<li>Podrška za publiciranje release-a na produkciju</li>
|
||||||
<li>Podrška za publiciranje release-a na produkciju</li>
|
<li>Omogućavanje ispravke manjih bugova i pripremu metapodataka za release</li>
|
||||||
<li>Omogućavanje ispravke manjih bugova i pripremu metapodataka za release</li>
|
</ul>
|
||||||
</ul>
|
<p class="divider">★ ★ ★</p>
|
||||||
<p class="divider">★ ★ ★</p>
|
<div class="col-1">
|
||||||
<div class="col-1">
|
<h3>Započnite release</h3>
|
||||||
<h3>Započnite release</h3>
|
|
||||||
|
<p>Da započnete release, koristite git flow release komandu. Kreira release branch kreiran iz 'develop' branch-a.</p>
|
||||||
<p>Da započnete release, koristite git flow release komandu. Kreira release branch kreiran iz 'develop' branch-a.</p>
|
<blockquote>
|
||||||
<blockquote>
|
git flow release start RELEASE [BASE]
|
||||||
git flow release start RELEASE [BASE]
|
</blockquote>
|
||||||
</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>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 class="divider">★ ★ ★</p>
|
<p>Bilo bi pametno publicirati release branch nakon kreiranja da se omoguće release commit-i
|
||||||
<p>Bilo bi pametno publicirati release branch nakon kreiranja da se omoguće release commit-i
|
od ostalih developera. Slično publiciranju funkcionalnosti:</p>
|
||||||
od ostalih developera. Slično publiciranju funkcionalnosti:</p>
|
<blockquote>
|
||||||
<blockquote>
|
git flow release publish RELEASE
|
||||||
git flow release publish RELEASE
|
</blockquote>
|
||||||
</blockquote>
|
<p>(Možete pratiti udaljeni release sa <br/><code>git flow release track RELEASE</code> komandom)</p>
|
||||||
<p>(Možete pratiti udaljeni release sa <br/><code>git flow release track RELEASE</code> komandom)</p>
|
</div>
|
||||||
</div>
|
<div class="col-2">
|
||||||
<div class="col-2">
|
<div class="release-start"></div>
|
||||||
<div class="release-start"></div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<div class="col-1">
|
||||||
<div class="col-1">
|
<h3>Dovršavanje release-a</h3>
|
||||||
<h3>Dovršavanje release-a</h3>
|
|
||||||
|
<p>Dovršiti release je veliki korak u git branchanju. Izvršava nekoliko akcija:</p>
|
||||||
<p>Dovršiti release je veliki korak u git branchanju. Izvršava nekoliko akcija:</p>
|
<ul>
|
||||||
<ul>
|
<li>Merge-a release branch natrag u 'master'</li>
|
||||||
<li>Merge-a release branch natrag u 'master'</li>
|
<li>Tagira release sa njegovim nazivom</li>
|
||||||
<li>Tagira release sa njegovim nazivom</li>
|
<li>Merge-a release natrag u 'develop'</li>
|
||||||
<li>Merge-a release natrag u 'develop'</li>
|
<li>Uklanja release branch</li>
|
||||||
<li>Uklanja release branch</li>
|
</ul>
|
||||||
</ul>
|
<blockquote>
|
||||||
<blockquote>
|
git flow release finish RELEASE
|
||||||
git flow release finish RELEASE
|
</blockquote>
|
||||||
</blockquote>
|
<p>Ne zaboravite poslati tagove sa <code>git push --tags</code></p>
|
||||||
<p>Ne zaboravite poslati tagove sa <code>git push --tags</code></p>
|
|
||||||
|
</div>
|
||||||
</div>
|
<div class="col-2">
|
||||||
<div class="col-2">
|
<div class="release-end"></div>
|
||||||
<div class="release-end"></div>
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<h2><a name="hotfixes" href="#hotfixes">Brze prepravke</a></h2>
|
||||||
<h2><a name="hotfixes" href="#hotfixes">Brze prepravke</a></h2>
|
|
||||||
|
<ul>
|
||||||
<ul>
|
<li>Kada je potrebno brzinski ispraviti greške na produkciji, koristi se hotfix mogućnost.
|
||||||
<li>Kada je potrebno brzinski ispraviti greške na produkciji, koristi se hotfix mogućnost.
|
</li>
|
||||||
</li>
|
<li>Može se napraviti branch iz odgovarajućeg taga na master branchu koji označava produkcijsku verziju.</li>
|
||||||
<li>Može se napraviti branch iz odgovarajućeg taga na master branchu koji označava produkcijsku verziju.</li>
|
</ul>
|
||||||
</ul>
|
<p class="divider">★ ★ ★</p>
|
||||||
<p class="divider">★ ★ ★</p>
|
<div class="col-1">
|
||||||
<div class="col-1">
|
<h3>git flow hotfix start</h3>
|
||||||
<h3>git flow hotfix start</h3>
|
|
||||||
|
<p>Kao i druge git flow komande, hotfix se započinje sa</p>
|
||||||
<p>Kao i druge git flow komande, hotfix se započinje sa</p>
|
<blockquote>
|
||||||
<blockquote>
|
git flow hotfix start VERSION [BASENAME]
|
||||||
git flow hotfix start VERSION [BASENAME]
|
</blockquote>
|
||||||
</blockquote>
|
<p>Argumet 'version' označava naziv hotfix release-a. Dodatno, možete specificirati 'basename' iz kojeg se započinje hotfix.</p>
|
||||||
<p>Argumet 'version' označava naziv hotfix release-a. Dodatno, možete specificirati 'basename' iz kojeg se započinje hotfix.</p>
|
</div>
|
||||||
</div>
|
<div class="col-2">
|
||||||
<div class="col-2">
|
<div class="hotfix-start"></div>
|
||||||
<div class="hotfix-start"></div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<div class="col-1">
|
||||||
<div class="col-1">
|
<h3>Dovršavanje hotfixa</h3>
|
||||||
<h3>Dovršavanje hotfixa</h3>
|
|
||||||
|
<p>Dovršavanjem, hotfix biva merge-an natrag u 'develop' i 'master'. Dodatno, merge u 'master' biva tagiran sa verzijom hotfixa.</p>
|
||||||
<p>Dovršavanjem, hotfix biva merge-an natrag u 'develop' i 'master'. Dodatno, merge u 'master' biva tagiran sa verzijom hotfixa.</p>
|
<blockquote>
|
||||||
<blockquote>
|
git flow hotfix finish VERSION
|
||||||
git flow hotfix finish VERSION
|
</blockquote>
|
||||||
</blockquote>
|
</div>
|
||||||
</div>
|
<div class="col-2">
|
||||||
<div class="col-2">
|
<div class="hotfix-end"></div>
|
||||||
<div class="hotfix-end"></div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
<div>
|
||||||
<div>
|
<div class="col-1"></div>
|
||||||
<div class="col-1"></div>
|
<div class="col-2">
|
||||||
<div class="col-2">
|
<div class="lines-close"></div>
|
||||||
<div class="lines-close"></div>
|
<div class="lines-small-end"></div>
|
||||||
<div class="lines-small-end"></div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<h2><a name="commands" href="#commands">Komande</a></h2>
|
||||||
<h2><a name="commands" href="#commands">Komande</a></h2>
|
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
</div>
|
||||||
</div>
|
|
||||||
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<h2>Backlog</h2>
|
||||||
<h2>Backlog</h2>
|
<p class="divider">★ ★ ★</p>
|
||||||
<p class="divider">★ ★ ★</p>
|
<ul>
|
||||||
<ul>
|
<li>Nisu sve moguće komande, samo one najčešće korištene</li>
|
||||||
<li>Nisu sve moguće komande, samo one najčešće korištene</li>
|
<li>Možete dalje normalno koristiti git i sve njegove komande, git flow je samo kolekcija alata
|
||||||
<li>Možete dalje normalno koristiti git i sve njegove komande, git flow je samo kolekcija alata
|
</li>
|
||||||
</li>
|
<li>Npr. 'support' mogućnost je još beta, njena se uporaba ne preporučuje</li>
|
||||||
<li>Npr. 'support' mogućnost je još beta, njena se uporaba ne preporučuje</li>
|
<li>Pošaljite svoje prijevode, rado ću ih integrirati</li>
|
||||||
<li>Pošaljite svoje prijevode, rado ću ih integrirati</li>
|
</ul>
|
||||||
</ul>
|
<p class="divider">★ ★ ★</p>
|
||||||
<p class="divider">★ ★ ★</p>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
|
<footer>
|
||||||
<footer>
|
<div class="scrollblock">
|
||||||
<div class="scrollblock">
|
<h2><a name="comments" href="#comments">Comments</a></h2>
|
||||||
<h2><a name="comments" href="#comments">Comments</a></h2>
|
|
||||||
|
<div id="disqus_thread"></div>
|
||||||
<div id="disqus_thread"></div>
|
</div>
|
||||||
</div>
|
</footer>
|
||||||
</footer>
|
|
||||||
|
<script type="text/javascript">
|
||||||
<script type="text/javascript">
|
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||||
/* * * 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 * * */
|
||||||
/* * * DON'T EDIT BELOW THIS LINE * * */
|
(function () {
|
||||||
(function () {
|
var dsq = document.createElement('script');
|
||||||
var dsq = document.createElement('script');
|
dsq.type = 'text/javascript';
|
||||||
dsq.type = 'text/javascript';
|
dsq.async = true;
|
||||||
dsq.async = true;
|
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
|
||||||
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
|
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
})();
|
||||||
})();
|
</script>
|
||||||
</script>
|
<noscript>Molim, omogućite JavaScript da bi vidjeli <a href="http://disqus.com/?ref_noscript">komentare na Disqusu.</a>
|
||||||
<noscript>Molim, omogućite JavaScript da bi vidjeli <a href="http://disqus.com/?ref_noscript">komentare na Disqusu.</a>
|
</noscript>
|
||||||
</noscript>
|
<a href="http://disqus.com" class="dsq-brlink">Komentari putem <span class="logo-disqus">Disqus</span></a>
|
||||||
<a href="http://disqus.com" class="dsq-brlink">Komentari putem <span class="logo-disqus">Disqus</span></a>
|
|
||||||
|
|
||||||
|
</body>
|
||||||
</body>
|
</html>
|
||||||
</html>
|
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
<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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
<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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
<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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
<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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
<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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -12,7 +12,6 @@
|
|||||||
font-family: 'Lobster';
|
font-family: 'Lobster';
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -7,7 +7,6 @@
|
|||||||
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
<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/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.css" type="text/css" media="screen,print">
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork no GitHub</a></div>
|
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork no GitHub</a></div>
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
<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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -17,7 +17,6 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
<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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -17,7 +17,6 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
<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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
<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.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var _gaq = _gaq || [];
|
var _gaq = _gaq || [];
|
||||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||||
|
|||||||
@ -9,7 +9,6 @@
|
|||||||
<link rel="stylesheet" href="css/style.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">
|
<link rel="stylesheet" href="css/style.zh_TW.css" type="text/css" media="screen,print">
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var _gaq = _gaq || [];
|
var _gaq = _gaq || [];
|
||||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user