Differences

This shows you the differences between two versions of the page.

--- collab:git [2012/03/15 10:55]
c703101 [Basic Workflow]
+++ collab:git [2018/09/03 19:35]
@@ Line 1: / Line 1: @@
-====== Git ======
-Git is an extremely powerful and flexible revision control system, and using it effectively requires adherence to conventions.
-===== IIS Repository Policy =====
-  * A distinct tree / a repository - is maintained for each independent (software, paper, ...) project.
-  * For each project, the mainline (master) tree is hosted here at the iis uibk servers.
-  * Contributors develop locally and maintain their own trees, and push (or request to pull) only generally-useful, tried-and-proven patch sets into the main tree.
-  * Where appropriate, multiple external developers can exchange patches among each others before committing to the mainline.
-  * Branches are used to maintain multiple releases simultaneously while developing new features in the trunk. As long as we will not generally have formal releases, there will be little or no need for branches.
-===== Basic Workflow =====
-{{ :collab:git-usage.png?300|git std. usage}}
-Retrieve an %%IIS%% Git tree for you to work on:
-  git clone ssh://iis.uibk.ac.at/projects/git/PROJECTNAME
-Prepend the hostname with ''USERNAME@'' if your Git username does not match your local username.
-Now make your edits.  To see the status of your files with respect to your repository, do:
-  git status
-For each reasonable unit of changes, tell Git that you want to keep it, and then commit it to your local tree:
-  git add FILENAME
-  git commit -m "brief documentation of your changes"
-Each self-contained, fully-functional set of changes that you want to make public should be pushed upstream to the %%IIS%% master tree:
-  git push
-At this point you are free to delete your local Git tree.
-In the meantime, you can retrieve updates from the %%IIS%% master tree with:
-  git pull
-For more information, see the [[http://gitref.org/|Git Reference]] and [[http://www.kernel.org/pub/software/scm/git/docs/everyday.html|Everyday Git]].
-==== Comparison to Subversion ====
-Here, two key distinctions from SVN are
-  * the //staging area// ("index") where you define the changes to be commited. (SVN commits directly from the working directory.)
-  * the //distributed// nature. Commits are done to the local clone of the repository. Sharing your changes requires explicit action, e.g., ''git push''. (SVN commits directly to a central repository.)
-===== More Advanced Hints =====
-==== Git Revisions ====
-The following diagram is an example 'commit' view of a master tree (w.o. branches).
-it describes the difference between revert and reset.
-{{ :collab:git_revisions_without_branches.png?400|git revisions wo branches}}
-==== 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:
-  cd PROJECTROOT
-  git init --shared
-  git add .
-  git commit -m "initial import"
-==== 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
-  aptitude install tig
-change into the git working directory and start
-  tig
-==== Patches ====
-Generate Patches and use Peer-to-peer patch exchanges ((example taken from http://linuxwireless.org/en/developers/Documentation/git-guide))
-  git format-patch --cover-letter -o some-dir d8a285c8f83f728be2d056e6d4b0909972789d51..9202ec15da36ca060722c363575e0e390d85fb71
-  # this is equivalent to, this is the short form
-  git format-patch --cover-letter -n -o some-dir d8a28..9202e
-Where d8a28 was the last commit before you started hacking and 9202e is the current head, meaning the commit ID of your latest commit.
-For renaming files add "-M" to the git-format-patch arguments then patches wont create removals and adds for a simple rename.
-Sending Patches:
-  git send-email --no-chain-reply-to --from "My Name <my.name@uibk.ac.at>" --to recipient@domain some-directory/
-==== Ssh Config ====
-You could also create an ssh config file in your home-directory to shorten the git commands:
-The ~/.ssh/config file could look like:
-<file>
-Host iis
-    HostName iis.uibk.ac.at
-    Port 2222
-    User username
-    #IdentityFile  ~/.ssh/PRIVATEKEYFILE
-</file>
-The IdentityFile line is only for ssh key auth necessary.
-The commands then would look like
-  git clone ssh://iis/projects/git/projectname
-{{tag>git Usage}}

User Tools

Site Tools

Differences

Page Tools