... | ... | @@ -6,14 +6,14 @@ Another major feature are **commits**. A commit is a selection of files added / |
|
|
|
|
|
This is a very basic tutorial with a collection of the most important commands and a minimal example. Please see [this](https://git-scm.com/doc) and [this](https://www.atlassian.com/git/tutorials/) for more info.
|
|
|
|
|
|
And see [this guide](https://ias-group.slack.com/files/simone/F1NKF97A8/Git_Workflow.md) for a correct workflow.
|
|
|
And see [this guide](https://git.ias.informatik.tu-darmstadt.de/ausy/wiki/wikis/git-flow) for a correct workflow.
|
|
|
|
|
|
|
|
|
# Workflow Example
|
|
|
------------------
|
|
|
-----------------------------
|
|
|
|
|
|
### Locally
|
|
|
-----------
|
|
|
----------------
|
|
|
|
|
|
To **clone** locally a repository run
|
|
|
|
... | ... | @@ -91,7 +91,7 @@ By running |
|
|
you revert the changes you stashed and merge with the new stuff. However, remember that everything is done **locally**! If you forgot to `stash pop` and you edit the same file, you will get a conflict and you will be asked to solve it. Also, you can do multiple stash and pop, you can give names to stashes and so on ...
|
|
|
|
|
|
### Remotely
|
|
|
------------
|
|
|
--------------------
|
|
|
|
|
|
So far we have worked locally. Now we want to push everything remotely by running
|
|
|
|
... | ... | @@ -118,7 +118,7 @@ If you have some commits to be pushed, you will be asked to do a merge. If there |
|
|
|
|
|
|
|
|
### Git Gui
|
|
|
-----------
|
|
|
---------------
|
|
|
|
|
|
sudo apt-get install git-gui
|
|
|
git gui
|
... | ... | @@ -127,7 +127,7 @@ It is an interface that easily allows you to add unstaged / uncommitted files, t |
|
|
|
|
|
|
|
|
# FAQs
|
|
|
-------
|
|
|
----------
|
|
|
|
|
|
1. How do I create a new branch?
|
|
|
|
... | ... | |