http://b-kaempgen.de/index.php?action=history&feed=atom&title=Git 2026-04-29T11:12:38Z Revision history for this page on the wiki MediaWiki 1.22.2 http://b-kaempgen.de/index.php?title=Git&diff=302&oldid=prev 2014-09-29T02:38:49Z

<p>‎<span dir="auto"><span class="autocomment">Common Commands</span></span></p> <table class='diff diff-contentalign-left'> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr style='vertical-align: top;'> <td colspan='2' style="background-color: white; color:black; text-align: center;">← Older revision</td> <td colspan='2' style="background-color: white; color:black; text-align: center;">Revision as of 02:38, 29 September 2014</td> </tr><tr><td colspan="2" class="diff-lineno">Line 15:</td> <td colspan="2" class="diff-lineno">Line 15:</td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>* git remote add fork https://github.com/bkaempgen/olap4j-xmlaserver.git</div></td><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>* git remote add fork https://github.com/bkaempgen/olap4j-xmlaserver.git</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>* git checkout master - switch to master or branch</div></td><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>* git checkout master - switch to master or branch</div></td></tr> <tr><td colspan="2">&#160;</td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">* git log document.tex - for logs</ins></div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>* Roll back</div></td><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>* Roll back</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>&lt;pre&gt;</div></td><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>&lt;pre&gt;</div></td></tr> </table>

Benedikt Kämpgen http://b-kaempgen.de/index.php?title=Git&diff=301&oldid=prev 2014-09-29T02:32:38Z

<p>Created page with &quot;<a href="/index.php?title=Description::Common_git_commands.&amp;action=edit&amp;redlink=1" class="new" title="Description::Common git commands. (page does not exist)">Description::Common git commands.</a> * Basic commands: http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository == Common Commands == * used git clone uri * u...&quot;</p> <p><b>New page</b></p><div>[[Description::Common git commands.]]<br /> <br /> * Basic commands: http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository<br /> <br /> == Common Commands ==<br /> * used git clone uri<br /> * used git status<br /> * used git add<br /> * used git status --staged &lt;= <br /> * git diff --cached &lt;= staged so far see differences: git diff file<br /> * git commit &lt;= to your local repository<br /> * git push origin master (push upstream if you have write access) &lt;= origin ist remote repository, master ist der branch<br /> * git remote show origin &lt;= look at info about upstream source<br /> * git diff origin master &lt;= show difference between current commit and upstream<br /> * git remote add fork https://github.com/bkaempgen/olap4j-xmlaserver.git<br /> * git checkout master - switch to master or branch<br /> * Roll back<br /> &lt;pre&gt;<br /> git fetch origin<br /> git reset --hard origin/master<br /> &lt;/pre&gt;<br /> <br /> === Google Code ===<br /> * maybe reset first when problems<br /> * git clone https://benedikt.kaempgen@code.google.com/p/ldcx/<br /> * git status<br /> * git push origin master<br /> <br /> ==Problems==<br /> ===Difference between repositories===<br /> * http://stackoverflow.com/questions/5162800/git-diff-between-cloned-and-original-remote-repository<br /> <br /> ===How do i fix merge conflicts in git===<br /> * http://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git<br /> * git mergetool<br /> * git commit -m &quot;Merge conflict resolution&quot;<br /> <br /> ===Renaming===<br /> * Kein großes Problem: http://www.patrick-wied.at/blog/rename-files-and-folders-with-git<br /> <br /> [[Category:Howto]]</div>

Benedikt Kämpgen