Difference between revisions of "Git"
From www.b-kaempgen.de
(Created page with "Description::Common git commands. * Basic commands: http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository == Common Commands == * used git clone uri * u...") |
(→Common Commands) |
||
| Line 15: | Line 15: | ||
* git remote add fork https://github.com/bkaempgen/olap4j-xmlaserver.git | * git remote add fork https://github.com/bkaempgen/olap4j-xmlaserver.git | ||
* git checkout master - switch to master or branch | * git checkout master - switch to master or branch | ||
| + | * git log document.tex - for logs | ||
* Roll back | * Roll back | ||
<pre> | <pre> | ||
Latest revision as of 02:38, 29 September 2014
Common git commands.
Contents
Common Commands
- used git clone uri
- used git status
- used git add
- used git status --staged <=
- git diff --cached <= staged so far see differences: git diff file
- git commit <= to your local repository
- git push origin master (push upstream if you have write access) <= origin ist remote repository, master ist der branch
- git remote show origin <= look at info about upstream source
- git diff origin master <= show difference between current commit and upstream
- git remote add fork https://github.com/bkaempgen/olap4j-xmlaserver.git
- git checkout master - switch to master or branch
- git log document.tex - for logs
- Roll back
git fetch origin git reset --hard origin/master
Google Code
- maybe reset first when problems
- git clone https://benedikt.kaempgen@code.google.com/p/ldcx/
- git status
- git push origin master
Problems
Difference between repositories
How do i fix merge conflicts in git
- http://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git
- git mergetool
- git commit -m "Merge conflict resolution"
Renaming
- Kein großes Problem: http://www.patrick-wied.at/blog/rename-files-and-folders-with-git
