This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Next revision Both sides next revision | ||
collab:git [2015/04/10 08:43] c7031007 [IIS Repository Policy] |
collab:git [2016/02/26 18:41] c7031007 [Git] |
||
---|---|---|---|
Line 1: | Line 1: | ||
====== Git ====== | ====== Git ====== | ||
- | <code> | + | |
- | Update (15/03/2012): Port 2222 is depricated. All services run additionally on Port 22 | + | |
- | Update (13/03/2012): More than 5 wrong authentications yield into a 10 minute ip-address ban | + | |
- | </code> | + | |
Git is an extremely powerful and flexible revision control system, and using it effectively requires adherence to conventions. | Git is an extremely powerful and flexible revision control system, and using it effectively requires adherence to conventions. | ||
Line 56: | Line 53: | ||
==== Creating a New Git Project ==== | ==== Creating a New Git Project ==== | ||
- | |||
- | To create a shared Git repository, [[intranet:systems:docs:git-ssh#creating_a_shared_git_repository|initialize it on the lab server]]. Then, [[#basic_workflow|clone and populate]] it. | ||
To create your personal Git repository for your own, local use only: | To create your personal Git repository for your own, local use only: | ||
Line 65: | Line 60: | ||
git add . | git add . | ||
git commit -m "initial import" | git commit -m "initial import" | ||
+ | |||
+ | To create a Git repository on the IIS server: | ||
+ | |||
+ | - Decide on a name and a place for the repository under ''/projects/git/''. It should live inside the appropriate subdirectory (''papers/'', ''projects/'', etc.), and should follow the repository naming conventions. For example, repositories holding published papers should be named by [[:intranet:public:papers#publication_ids|Publication ID]]. Use ''/projects/git/personal/'' only for material that is not and will not be useful to the lab. | ||
+ | - [[intranet:systems:docs:git-ssh#creating_a_shared_git_repository|Initialize]] your new repository on the lab server. | ||
+ | - Inside the newly-created repository directory on the server, edit the ''description'' file. This is diplayed e.g. [[:intranet:git-repos|here]]. | ||
+ | - [[#basic_workflow|Clone and populate]] your new repository. | ||
Line 100: | Line 102: | ||
==== Textmode Tool For Git ==== | ==== Textmode Tool For Git ==== | ||
a nice (commandline) tool for viewing commits, logs, diffs and other changes is tig. to install tig on a debian based machine | a nice (commandline) tool for viewing commits, logs, diffs and other changes is tig. to install tig on a debian based machine | ||
- | aptitude install tig | + | apt install tig |
change into the git working directory and start | change into the git working directory and start | ||
tig | tig |