Git
Inhaltsverzeichnis
Basics
Git is a Distributed Version Control System (DVCS).
Local Operations
- Working directory
- Files where you work
- Staging Area
- Staged diffs are ready to be committed
- git repository
- Committed files
Config
- System (/etc/gitconfig)
- git config --system
- Global (~/.gitconfig)
- git config --global
- Repository (%WORKINGDIRECTORY%/.git/config)
- git config --local
Ignoring files
In workingdirectory:
vim .gitignore
Working local
Clone existing Repository
git clone git://github.com/schacon/grit.git
- That creates a directory named "grit", initializes a .git directory inside it, pulls down all the data for that repository, and checks out a working copy of the latest version
git clone git://github.com/schacon/grit.git mygrit
- Creates "mygrit" directory instead of "grit"
Check Status
git status
Statusmeldung: Your branch is ahead of 'origin/master' by 1 commit. -> Lokal ist 1 commit mehr vorhanden als origin/master.
Show log
git logoder
gitk
git log --stat
Mit Zusammenfssung der Änderungen
Formatting output
git log --pretty=oneline
git log --pretty=format:"%h - %an, %ar : %s"
git log --pretty=format:"%h %s" --graph
Limit output
git log --since=2.weeks
git log --2
git log --pretty="%h - %s" --author=gitster --since="2008-10-01" --before="2008-11-01" --no-merges
Stage files
A modified file under version control can be staged with the command
git addor use
git gui
git add is also used to add new files to version control.
Commit files
git commit
git commit -m 'initial project version'
Remove files
git rm readme.txt
deletes the readme.txt file from working directory (file is really deleted) and from version control.
git rm --cached readme.txt
deletes the readme.txt file from version control, but not from working directory (file is still on filesystem).
Working with Remotes
You must have cloned an existing Repository before working with remotes. See Clone existing Repository
Show remote repositories
git remote
git remote -v
Adding Remote Repositories
git remote add mic git@git-server:~mic/ishop-ap/mic-ishop-ap.git
Update repository
gets all changes from mic without merge:
git fetch mic
gets all changes from origin without merge:
git fetch origin
gets all changes from origin and merges to current branch (or master):
git pull origin
Pushing to Remotes
git push [remote-name] [branch-name]
git push origin masterPushes your master branch to your origin server
Inspecting a Remote
git remote show origin
Merging / Rebase
git merge
git rebase
Im Gegensatz zu git merge 'kopiert' git rebase alle commits vom <source> auf dem <target>. Und zwar ab dem commit, wo sie sich getrennt haben.
A---B---C branch (<source>) / D---E---F---G master (<target>) D---E---F---G---A'--B'--C' branch master
Rebase current branch on <target>:
git rebase <target>
Rebase <source>-branch on <target>:
git rebase <target> <source>
Das Rebasen funktioniert nur lokal. Also, wenn man ein Branch aus dem Remote-Repository rebasen will, muss dieser Branch lokal vorhanden sein. Ansonsten diesen Branch lokal erstellen vor dem Rebase. Falls der Source-Branch fehlt, wird trotzdem rebased, allerdings ist man dann in keinem Branch, sondern in einem 'Commit' (Hashtag).
Tagging
List tags
git tag
git tag -l '2.0.*'lists only tags matching '2.0.*'-pattern
Create tags
Annotated (recommended)
Are stored as full objects in the Git database. They’re checksummed, contain the tagger name, e-mail, and date, have a tagging message
git tag -a v1.4 -m 'my version 1.4'
Lightweight (eg. for temporary use)
like a branch that doesn’t change — it’s just a pointer to a specific commit
git tag v1.4-1
Tipps and tricks
Use stash
Stash: Verstauen. 'Versorgt' die aktuellen Änderungen in einer Schublade, um es später wieder hervorzunehmen. Nützlich, wenn man Änderungen hat, die man noch nicht committen will, aber kurzzeitig zu einem anderen Projekt bzw. Branch wechseln will.
Lists the stashes:
git stash list
Save your local modifications to a new stash, and run git reset --hard to revert them. Saves with message: 'no idea what i'm doing here':
git stash save no idea what i'm doing here
Remove a single stashed state from the stash list and apply it on top of the current working tree state:
git stash pop stash@{0}
Like pop, but do not remove the state from the stash list:
git stash apply stash@{0}
Remove a single stashed state from the stash list:
git stash drop stash@{0}
show changes:
git stash show stash@{0}