Git: Unterschied zwischen den Versionen

Aus BotE Wiki
Zur Navigation springen Zur Suche springen
 
(6 dazwischenliegende Versionen desselben Benutzers werden nicht angezeigt)
Zeile 4: Zeile 4:
 
This site is to get familar with Git and to learn how to manage it. See also [[Programm-Code#Github]] for details of BotE-Repository !
 
This site is to get familar with Git and to learn how to manage it. See also [[Programm-Code#Github]] for details of BotE-Repository !
 
== Git ==
 
== Git ==
 +
 +
*http://ccc.zerties.org/index.php/Git_HowTo
 +
 +
*http://www-cs-students.stanford.edu/~blynn/gitmagic/intl/de/index.html
 +
 +
*http://www.ralfebert.de/git/
  
 
=== Commits ===
 
=== Commits ===
Zeile 30: Zeile 36:
 
http://birth-of-the-empires.de/wiki_files/Bilder/Git/Git-Blame(Verantwortung).jpg
 
http://birth-of-the-empires.de/wiki_files/Bilder/Git/Git-Blame(Verantwortung).jpg
  
 +
== TortoiseGit ==
 +
 +
 +
=== Sync (Download) ===
 +
 +
<div style="overflow-y:hidden;overflow-x:scroll;border:1px solid #000000;padding:1em;padding-top:0.5em;">
 +
{|
 +
| style="border:2px solid #000000;padding:1em;padding-top:0.5em;width=10%;"|
 +
fetch (download)
 +
|
 +
<img>http://birth-of-the-empires.de/wiki_files/Bilder/Git/Git-Download.jpg</img>
 +
| style="border:2px solid #000000;padding:1em;padding-top:0.5em;width=40%;"|
 +
There are 4 topics at Github:
 +
*"master" - this is the original BotE-Repository
 +
*"Alpha7.x" - this is an old branch dated Alpha7 (V0.90) for backup purpose to have original V0.90-program code
 +
*"gh-pages" - this is a branch of git (system standard) used for BotE's website at Git
 +
*"manager" - this is Anonymissimus (additional) branch where he developes code of System manager
 +
In the screenshot left side the last three were already up to date.
 +
 +
The first (original BotE-Repository) there were chances: 32 objects, compressed, downloaded and included into local PC "origin/master"
  
−
== TortoiseGit ==
+
'''For details here click left bottom "Zeige Log"(Show log).'''
 +
 
 +
Don't forget to set date (red marked) up to today's date.
 +
|
 +
<img>http://birth-of-the-empires.de/wiki_files/Bilder/Git/Git-Download-ShowLog.jpg</img>
 +
|}
 +
</div>
  
 
=== commit ===
 
=== commit ===
Zeile 52: Zeile 84:
 
</div>
 
</div>
  
 +
=== Contextmenue ===
 +
 +
http://birth-of-the-empires.de/wiki_files/Bilder/Git/TortoiseGit-Kontextmenue.jpg
 +
 +
 +
http://birth-of-the-empires.de/wiki_files/Bilder/Git/TortoiseGit-KontextmenueEinstellen.jpg
  
 
== git command line ==
 
== git command line ==
 +
 +
*im Wunschverzeichnis (und nach Git-Installation natürlich): c:\...\_BotE-Repo\>"git clone https://github.com/bote-team/bote.git" -> nach wenigen Sekunden startet der Download
 +
http://birth-of-the-empires.de/wiki_files/Bilder/Git/git-clone(command_line).jpg
 +
  
 
*http://birth-of-the-empires.de/wiki_files/Bilder/Deutsch-Symbol.jpg http://rogerdudler.github.io/git-guide/index.de.html
 
*http://birth-of-the-empires.de/wiki_files/Bilder/Deutsch-Symbol.jpg http://rogerdudler.github.io/git-guide/index.de.html

Aktuelle Version vom 11. Januar 2014, 15:49 Uhr

click here for other languages Russland-Symbol.gif

This site is to get familar with Git and to learn how to manage it. See also Programm-Code#Github for details of BotE-Repository !

Git

Commits

Commits: https://github.com/bote-team/bote/commits/master

Commits: File Overview

<img>http://bote2.square7.ch/images/GitHubCommits1.jpg</img>

leads to -->

<img>http://bote2.square7.ch/images/GitHubCommits2.jpg</img>

Blame

(Verantwortung)

shows who has done what e.g. line 1 ("0.9") did SirP, line 13 did bote-reginald

Git-Blame(Verantwortung).jpg

TortoiseGit

Sync (Download)

fetch (download)

<img>Git-Download.jpg</img>

There are 4 topics at Github:

  • "master" - this is the original BotE-Repository
  • "Alpha7.x" - this is an old branch dated Alpha7 (V0.90) for backup purpose to have original V0.90-program code
  • "gh-pages" - this is a branch of git (system standard) used for BotE's website at Git
  • "manager" - this is Anonymissimus (additional) branch where he developes code of System manager

In the screenshot left side the last three were already up to date.

The first (original BotE-Repository) there were chances: 32 objects, compressed, downloaded and included into local PC "origin/master"

For details here click left bottom "Zeige Log"(Show log).

Don't forget to set date (red marked) up to today's date.

<img>Git-Download-ShowLog.jpg</img>

commit

push progress (normal commit)

<img>http://bote2.square7.ch/images/GIT-Commit.jpg</img>

<img>http://bote2.square7.ch/images/GIT-Commit2.jpg</img>

<img>http://bote2.square7.ch/images/GIT-Commit3.jpg</img>

<img>http://bote2.square7.ch/images/GIT-Commit4.jpg</img>

<img>http://bote2.square7.ch/images/GIT-Commit5ready.jpg</img>

Contextmenue

TortoiseGit-Kontextmenue.jpg


TortoiseGit-KontextmenueEinstellen.jpg

git command line

git-clone(command_line).jpg



(vorher muß man evtl. Git manuell in den Pfad aufnehmen: dauerhaft siehe http://www.pctipp.ch/tipps-tricks/kummerkasten/windows-7/artikel/windows-path-aendern-50647/ oder temporär über "path=%path%;c:\Program Files (x86)\Git\bin") 

*git clone "git://github.com/bote-team/bote.git" "c:\BotE-Repo" (= checkout)
*git status (=status)
*git log
*git commit -m "first commit or whatever you want to write" (= local commit (must be uploaded !), -m might be message)
*git push (= upload)
*git pull (= download)
*git sync (= upload/download)
Abgerufen von „http://birth-of-the-empires.de/wiki/index.php?title=Git&oldid=6722“