extern/git-flow-cheatsheet
1
0
Fork 0
mirror of https://github.com/danielkummer/git-flow-cheatsheet.git synced 2024-11-22 16:03:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
231 Commits 2 Branches 1 Tag 2.8 MiB
7d543e4264
Commit Graph

231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
IntoVirtualDevelopment
7d543e4264
Space missing between url and text added 2018-09-26 12:09:11 +02:00
Daniel Kummer
b9ec21be93
Merge pull request #82 from isatrio/gh-pages 
Add new language Bahasa Indonesia - thanks to @isatrio
 2017-10-30 22:00:10 +01:00
Yudhi Satrio
b90e4dbbb8 Merge remote-tracking branch 'upstream/gh-pages' into gh-pages 2017-10-28 23:52:55 +07:00
Yudhi Satrio
38524de096 Add link bahasa Indonesia 2017-10-28 23:46:46 +07:00
Yudhi Satrio
cb6b0dd0ef Add new ID language 2017-10-28 22:37:35 +07:00
Daniel Kummer
c17623cfe0
Merge pull request #79 from baivong/gh-pages 
Change fonts support for Vietnamese -thanks @baivong
 2017-10-28 17:03:33 +02:00
Daniel Kummer
e652ee1ea4
Merge pull request #81 from Fcmam5/gh-pages 
minor corrections - thanks @Fcmam5
 2017-10-28 17:03:04 +02:00
Fcmam5
123a12be9a minor corrections 2017-10-28 01:24:27 +01:00
Lê Thành
803daa3240 Create style.vi_VN.css 2017-08-21 11:20:30 +07:00
Lê Thành
ee1687dc38 Update index.vi_VN.html 2017-08-21 11:19:51 +07:00
Daniel Kummer
2c2d57c487 Merge branches 'gh-pages' and 'gh-pages' of https://github.com/danielkummer/git-flow-cheatsheet into gh-pages 
# Conflicts:
#	index.ca_CA.html
#	index.de_DE.html
#	index.el_GR.html
#	index.es_ES.html
#	index.fr_FR.html
#	index.hr_HR.html
#	index.html
#	index.it_IT.html
#	index.ja_JP.html
#	index.ko_KR.html
#	index.nl_NL.html
#	index.pl_PL.html
#	index.pt_BR.html
#	index.ro_RO.html
#	index.ru_RU.html
#	index.tr_TR.html
#	index.uk_UA.html
#	index.vi_VN.html
#	index.zh_CN.html
#	index.zh_TW.html
 2017-03-31 19:53:08 +02:00
Daniel Kummer
d98c43ab8d Merge branch 'Jahangir-Sh-gh-pages' into gh-pages 2017-03-31 19:41:51 +02:00
Daniel Kummer
97532175ea Merge pull request #76 from lennonjesus/patch-1 
docs: Minor typo
 2017-03-31 19:39:17 +02:00
Lennon Jesus
ba1092b062 docs: Minor typo 2017-03-16 15:11:09 -03:00
Daniel Kummer
74b41ec4c6 Merge pull request #73 from ottnorml/gh-pages 
Little improvments - thanks for the cleanup @ottnorml 

FYI: I'm planning on doing a complete haul over of the cheatsheet sometimes in 2017 :)
 2016-12-05 10:03:55 +01:00
Daniel Kummer
99dc74d190 Merge pull request #72 from zygimantus/gh-pages 
Lithuanian language added - thanks to @zygimantus
 2016-12-05 10:02:42 +01:00
Daniel Kummer
e53da940a4 Merge pull request #71 from alexislefebvre/patch-1 
index.fr_FR.html: fix typos on French page - thanks to @alexislefebvre
 2016-12-05 10:02:22 +01:00
Daniel Kummer
790ee7eb9f Merge pull request #70 from Cevaru/patch-1 
Update style.css - thanks to @Cevaru
 2016-12-05 10:02:05 +01:00
Ottnorml
a1a284aa57 Changed Disqus URL to https 2016-11-30 17:58:10 +01:00
Ottnorml
9b5665c668 Removed obsolete jQuery request 2016-11-30 17:45:24 +01:00
Ottnorml
473922e745 Added git attributes for unification 2016-11-30 17:10:56 +01:00
zygimantus
8f518bbb53 Merge pull request #67 from smonff/gh-pages 
Proposal for bug #66 about Firefox and non-secure connections to Google Fonts API - thanks for the https changes :) @smonff
# Conflicts:
#	index.lt_LT.html
 2016-11-24 22:21:27 +02:00
zygimantus
ea4eee9d4f Space added 2016-11-24 22:15:48 +02:00
zygimantus
988e175415 Lithuanian language added 2016-11-24 22:15:18 +02:00
Alexis Lefebvre
46cb34276d
index.fr_FR.html: fix typos on French page 
Add unbreakable space before colon (this is a rule in French)
 2016-11-24 17:21:54 +01:00
Cevaru
085c0725b6 Update style.css 
Lines was too short ;)
 2016-11-22 18:37:11 +05:00
Daniel Kummer
05922b8034 Merge pull request #67 from smonff/gh-pages 
Proposal for bug #66 about Firefox and non-secure connections to Google Fonts API - thanks for the https changes :) @smonff
 2016-10-31 16:24:16 +01:00
Daniel Kummer
d2ca2628ef Merge pull request #56 from diomed/gh-pages 
Update index.hr_HR.html - thanks @diomed
 2016-10-31 16:23:26 +01:00
Daniel Kummer
f3af378551 Merge pull request #69 from daifabde/gh-pages 
Add Arabic language :) - thanks to @daifabde
 2016-10-31 16:22:39 +01:00
Abderrahman DAIF
edd1ebe458 Add Arabic language :) 2016-10-23 02:12:38 +02:00
Sébastien Feugère
9c1eae0ce3 Merge branch 'hotfix/google-fonts-api-ssl' into gh-pages 2016-09-12 18:41:21 +02:00
Sébastien Feugère
3e8882448e Add S(ecure)SL connection for the font tag. Avoids Firefox to block the unsecure connection. 2016-09-12 18:41:01 +02:00
Daniel Kummer
88d3ef1619 Merge pull request #63 from mylxsw/gh-pages 
update index.zh_cn，update missing content - thanks to @mylxsw
 2016-09-05 19:22:49 +02:00
Daniel Kummer
7a775061ec Merge pull request #64 from Seprum/gh-pages 
Fixed some errors & added missing link - thanks to @Seprum
 2016-09-05 19:22:23 +02:00
Vladyslav
ba8f46f555 Add missing ukrainian language link to italian translation 
Fix grammar & syntax errors in ukrainian translation
Fix ukrainian locale name
 2016-08-30 18:24:09 +03:00
管宜尧
a4d70ca3bf update index.zh_cn，update missing content 
update index.zh_cn，update missing content
 2016-08-30 11:53:44 +08:00
管宜尧
ae12614ee4 update index.zh_cn，update missing content 
update index.zh_cn，update missing content
 2016-08-30 11:53:03 +08:00
Jahangir Shabiyev
066c39a834 Minor translation fixes and Linux installation issue fix #62 2016-08-05 13:09:17 +04:00
Jahangir Shabiyev
524b032e83 missed - 2016-08-02 04:13:59 +04:00
Jahangir Shabiyev
abdb13a2b5 Translation link is added 2016-08-02 04:07:17 +04:00
Jahangir Shabiyev
54acab1603 Translation to az is completed 2016-08-02 03:59:10 +04:00
Daniel Kummer
422fc9f761 Merge pull request #59 from jlvaquero/gh-pages 
Minor spanish corrections. Thanks to @jlvaquero :)
 2016-07-06 08:00:04 +02:00
Jose Luis Vaquero Cuevas
db19a0e499 -Follow spanish version of Pro Git book naming convention. 
-Infinitive verbs in all titles to keep consistency.
-'Finalizar' better than 'Terminar' in this context.
-'Obtiene' better than 'Descarga' in this context.
 2016-07-01 09:04:49 +02:00
Daniel Kummer
a4e23be0bd Merge pull request #58 from tybw/patch-1 
Update index.zh_CN.html - thanks to @tybw
 2016-05-06 09:47:36 +02:00
Terence Wong
deadac6555 Update index.zh_CN.html 
Add back the missing link to traditional chinese page.
 2016-05-05 08:27:59 +12:00
Kruno H
a968025592 Update index.hr_HR.html 2016-04-21 20:54:04 +02:00
Daniel Kummer
114c38f01a Merge pull request #54 from zalari/gh-pages 
replace git-flow with git-flow-avh and adjust instructions accordingly

@ChristianUlbrich thank you very much for the detailed update and explanation. You're right about the initial git-flow version of nvie being dead (although it's a shame). 
Actually, we internally already switched to the AHV edition just for the same reason you're mentioning.

A side info: I'm currently planning on redoing the whole cheatsheet whilst keeping all the translations (of course) but because of other things requiring my attention at the moment this will take a while...

Best regards

Daniel
 2016-04-21 11:16:46 +02:00
Daniel Kummer
3fc28762f6 Merge pull request #53 from ebouchut/patch-1 
Fix a typo in: git flow feature finish - thanks @ebouchut for spotting it :)
 2016-04-21 11:13:05 +02:00
Christian Ulbrich
41b71b8961 replace git-flow with git-flow-avh and adjust instructions accordingly 
link to avh wiki instead of abandoned nvie wiki deep link to Windows instructions
 2016-04-20 11:08:21 +02:00
Daniel Kummer
402d9dd480 Merge pull request #52 from bmarkovic/gh-pages 
Added Croatian translation
 2016-04-02 16:43:06 +02:00