Agenda. Several projects are using GIT Developer(s) Junio Hamano, Linus Torvalds. Qt Stable release (January 31, 2011)

Transcription

1 Basic Agenda 1 Project information Who is ussing 2 14 Oct Basic Data Transport Work ow 4 Con gure 5 Basic Project information Who is ussing Project information Who is ussing Project information Original author(s) Linus Torvalds Who is ussing Several projects are using Developer(s) Junio Hamano, Linus Torvalds Git Qt Stable release (January 31, 2011) Linux Kernel Ruby on Rails Written in C, Bourne Shell, Perl Perl Android Operating system POSIX, Windows Eclipse PostgreSQL Type Revision control Gnome Debian License GNU General Public License v2 KDE X.org Website Basic Basic A branch is an active line of development. The most recent A ref pointing to a tag or commit object. In contrast to a head, a commit on a branch is referred to as the tip of that branch. The tip tag is not changed by a commit. s (not tag objects) are stored of the branch is referenced by a branch head, which moves forward in $_DIR/refs/tags/. A git tag has nothing to do with a Lisp as additional development is done on the branch. A single git tag (which would be called an object type in git's context). A tag repository can track an arbitrary number of branches, but your is most typically used to mark a particular point in the commit working tree is associated with just one of them (the current or ancestry chain. checked out branch), and HEAD points to that branch. tag object An object containing a ref pointing to another object, which can contain a message just like a commit object. It can also contain a (PGP) signature, in which case it is called a signed tag object. Basic Basic

2 The most commonly used git commands are add Add file contents to the index bisect Find by binary search the change that introduced a bug branch List, create, or delete branches checkout Checkout a branch or paths to the working tree clone Clone a repository into a new directory commit Record changes to the repository diff Show changes between commits, commit and working tree, etc fetch Download objects and refs from another repository grep Print lines matching a pattern init Create an empty git repository or reinitialize an existing one log Show commit logs merge Join two or more development histories together mv Move or rename a file, a directory, or a symlink pull Fetch from and merge with another repository or a local branch push Update remote refs along with associated objects rebase Forward-port local commits to the updated upstream head reset Reset current HEAD to the specified state rm Remove files from the working tree and from the index show Show various types of objects status Show the working tree status tag Create, list, delete or verify a tag object signed with GPG Global config git config --global user.name ''Your Name'' git config --global user. yourmail@yourdomain.org $HOME/.gitconfig [user] name = Jordi Blasco = jblasco@xrqtc.com.git/config Project specic congurations.git/info/exclude Project specic congurations # # This is the config file, and # a '#' or ';' character indicates # a comment # ; core variables [core] ; Don't trust file modes filemode = false ; Our diff algorithm [diff] external = /usr/local/bin/diff-wrapper renames = true ; Proxy settings [core] gitproxy="proxy-command" for kernel.org Jordi gitproxy=default-proxy Blasco (jblasco@xrqtc.com) ; for all Introduction the rest to # ignore objects and archives, anywhere in the tree. *.[oa].gitignore Stored in directory for ignoring $ cat Documentation/.gitignore # ignore generated html files, *.html # except foo.html which is maintained by hand!foo.html mkdir project git init (initializes the repository) git add. (add those unknown les) git commit -a -m commit message (commit all changes, edit changelog entry) ~/SRC$ mkdir mpiwrappers ~/SRC$ cd mpiwrappers/ ~/SRC/mpiwrappers$ git init Initialized empty Git repository in /home/jordi/src/mpiwrappers/.git/ ~/SRC/mpiwrappers$ cp -pr../modules-3.2.8/*. ~/SRC/mpiwrappers$ git commit -m "Importing Env. Modules source tree." [master (root-commit) 66b44b6] Importing Env. Modules source tree. 471 files changed, insertions(+), 0 deletions(-) create mode ChangeLog create mode INSTALL create mode INSTALL.RH7x create mode LICENSE.GPL create mode Makefile.am create mode Makefile.in... git clone git://git.xrqtc.org/project.git git clone ssh://user@git.xrqtc.org:ssh-port/project.git over ssh $ git clone ssh://jblasco@git.xrqtc.org:22048/git/phpqstat/ Initialized empty Git repository in /home/jordi/src/phpqstat/.git/ remote: Generating pack... remote: Done counting 46 objects. remote: Deltifying 46 objects. remote: 100% (46/46) done remote: Total 46, written 46 (delta 18), reused 0 (delta 0) Receiving objects: 100% (46/46), KiB, done. Resolving deltas: 100% (18/18), done.

3 git add. (add updated contents to the index) git di cached (will show you any changes that you've made but not yet added to the index) git status (get a brief summary of the situation) git commit -a (commit changes) git commit -a -m commit message (commit all changes, edit changelog entry) git log (to view the history of your changes) a git log -p (If you also want to see complete dis at each step) git log stat summary (Often the overview of the change is useful to get a feel of each step) git show <OBJECT> (Can use full or shorten hash) git reog (to list all changes that have ocurred) a to limit output can be combined and include max-count=4 (show 4 commits), until= , since='2 days ago', etc. ~/SRC/mpiwrappers$ git log --stat --summary commit 66b44b6d3bac6ea97b593e921cadf e9 Author: Jordi Blasco Pallares <jordi.blasco@xrqtc.org> Date: Wed Sep 7 10:33: Importing Env. Modules source tree. ChangeLog INSTALL INSTALL.RH7x LICENSE.GPL Makefile.am ModuleCmd_Init.c diff Show changes between commits, commit and working tree, etc. git di (Changes in the working tree not yet staged for the next commit.) git di cached (Changes between the index and your last commit; what you would be committing if you run "git commit"without -a"option.) git di HEAD (Changes in the working tree since your last commit; what you would be committing if you run "git commit -a") git di HEAD^ HEAD (Compare the version before the last commit and the last commit.) Viewing diff ~/SRC/mpiwrappers$ git diff HEAD^ diff --git a/install b/install index 9c766fb..e42325d a/install ,3 This new version is now the default, and will be all the users that log in and those that haven't loaded a specific module command version. patch files to prepare submission, if you adopt Linux kernel-style public forum workow. git format-patch HEAD^..HEAD + +MPIWRAPPERS Contribution + patch files jordi@urania:~/src/mpiwrappers$ git format-patch HEAD^..HEAD 0001-comment-added.patch jordi@urania:~/src/mpiwrappers$ cat 0001-comment-added.patch From ae3aec70075d5b ea89b955b80e761a4 Mon Sep 17 00:00: From: Jordi Blasco Pallares <jordi.blasco@xrqtc.org> Date: Wed, 7 Sep :12: Subject: [PATCH] comment added s are human readable shortcuts for hashes. Use this to identify a signicatibe change. git tag <tag-name> --- INSTALL files changed, 3 insertions(+), 0 deletions(-) diff --git a/install b/install index 9c766fb..e42325d a/install ,3 This new version is now the default, and will be referenced by all the users that log in and those that haven't loaded a specific module command version.

4 ~/SRC/mpiwrappers$ git tag v.0.11 ~/SRC/mpiwrappers$ vi Makefile.in ~/SRC/mpiwrappers$ git commit -m "comment at makefile" [master ] comment at makefile 2 files changed, 24 insertions(+), 0 deletions(-) create mode comment-added.patch ~/SRC/mpiwrappers$ git log v commit af3d417d8cd739dc7d79a234ad4b28c Author: Jordi Blasco Pallares <jordi.blasco@xrqtc.org> Date: Wed Sep 7 11:36: comment at makefile will never deletes a commit object! git checkout (to checkout a specic version or branch of the tree) git reset (move the tree back to a specied version) git revert (reverts commit without delete the commit objects) Cleaning Up git fsck (to check the object database to make sure all is sane) git gc (to clean up the repostory and compress les) ~/SRC/mpiwrappers$ echo "hifaefeaifhjjhn jhiofes" >> Makefile.in ~/SRC/mpiwrappers$ git commit -m "kk" [master ] kk 1 files changed, 1 insertions(+), 0 deletions(-) ~/SRC/mpiwrappers$ git reset v.0.11 Unstaged changes after reset: M Makefile.in ~/SRC/mpiwrappers$ tail -4 Makefile.in # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded..noexport: hifaefeaifhjjhn jhiofes ~/SRC/mpiwrappers$ echo "New mistake" >> Makefile.in ~/SRC/mpiwrappers$ git commit -m "kk2" [master b6dc131] kk2 2 files changed, 26 insertions(+), 0 deletions(-) create mode comment-added.patch ~/SRC/mpiwrappers$ git reset --hard v.0.11 HEAD is now at ae3aec7 comment added ~/SRC/mpiwrappers$ tail -4 Makefile.in # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded..noexport: git branch experimental (create a new branch named experimental) git branch (show list of all existing branches) git checkout experimental (switch to the experimental branch) git commit -a (commit changes to the experimental branch) git checkout master (at this point the two branches have diverged) Diverge / fork development histories Incorporates changes from the named commits (since the time their histories diverged from the current branch) into the current branch. This command is used by git pull to incorporate changes from another repository and can be used by hand to merge changes from one branch into another. Assume the following history exists and the current branch is master: A---B---C topic / D---E---F---G master Join two or more development histories together Then git merge topic will replay the changes made on the topic branch since it diverged from master (i.e., E) until its current commit (C) on top of master, and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes. A---B---C topic / \ D---E---F---G---H master git merge experimental (merge the changes made in experimental into master) git di (If the changes don't conict, you're done. If there are conicts, markers will be left in the problematic les showing the conict) git commit -a (Once you've edited the les to resolve the conicts)

5 git branch -d experimental (this will delete the experimental branch) git branch -D crazy-idea (This command ensures that the changes in the experimental branch are already in the current branch. a ) a If you develop on a branch crazy-idea, then regret it, you can always delete the branch with es are cheap and easy, so this is a good way to try something out. from public repository The way to update the developer changes is clone the master branch. $ git clone ssh://user@git.server.org/project.git master Pushing changes to a public repository To update the remote branch named master with the latest state of your branch named master, run $ git push ssh://git.xrqtc.org/project.git master Feching from public repository Retrieves objects and their related metadata from a remote repository Shows references within a remote $ git ls-remote ssh://git.xrqtc.org/project.git master $ git fetch ssh://user@git.server.org/project.git master Pulling changes to a public repository Like git fetch, but also merges changes into a corresponding branch $ git pull ssh://git.xrqtc.org/project.git master References References ing for Scrum (Bill Heys) Jon Loeliger, Control version with Git. O'Reilly - May Git User's Manual ( Git Immersion (