Historique de la page

Jasig décrit ici les bonnes pratiques d'utilisation de Git. On y trouve notamment le worklow à suivre pour faire une PR via un fork plutôt que sur le master.

sudo yum install git gitk gitg

git config --global http.proxy http://<LOGIN>:<PASSWORD>@<PROXYADDRESS>:<PORT>

git clone https://github.com/EsupPortail/esup-uportal.git

Cloning into 'esup-uportal'...
remote: Counting objects: 157549, done.
remote: Compressing objects: 100% (42597/42597), done.
remote: Total 157549 (delta 90619), reused 155749 (delta 89147)
Receiving objects: 100% (157549/157549), 129.96 MiB | 1.11 MiB/s, done.
Resolving deltas: 100% (90619/90619), done.
Checking out files: 100% (3263/3263), done

git tag

Note: checking out 'uportal-4.0.8-esup-0-avant-presta-1'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
  git checkout -b new_branch_name
HEAD is now at 7b39fed... README -> README-JASIG ; README.esup -> README

git checkout -b ent-monuniv

Switched to a new branch 'ent-monuniv'

git checkout master
  ou
git checkout ent-monuniv

Switched to branch 'master'
Switched to branch 'ent-monuniv'

git add <Path>/filters/esup.properties
git commit -m "Changement de connecteur" <Path>/filters/esup.properties

[ent-monuniv a82e27f] Changement de connecteur
1 file changed, 0 insertions(+), 0 deletions(-)
rewrite <Path>/filters/esup.properties(78%)

git pull

Already up-to-date.
  ou
Les fichiers mis à jour.

Note: checking out 'uportal-4.0.8-esup-0-avant-presta-1'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
  git checkout -b new_branch_name
HEAD is now at 7b39fed... README -> README-JASIG ; README.esup -> README

git merge <tag>

 Updating c6499c1..a82e27f
Fast-forward
README | Bin 3228 -> 3317 bytes
1 file changed, 0 insertions(+), 0 deletions(-)

...
<div id="footer">
  please contact us at email.support@github.com
</div>
...

git diff tag1 tag2

...
 $portalBarFontSize                             : 100%;
 $portalBarTextAlign                            : right;
-$portalBarTextTransform                        : capitalize;           # ce qui est supprimé
+$portalBarTextTransform                        : none;                 # ce qui est ajouté
 $portalBarLink                                 : $c1lighter;
 $portalBarLinkHover                            : $white;
...

git log fichier

/home/sweethome/GitHub/esup-uportal [7-SGBD]> git log README
commit b332be2266b4018a677fa2439f34db8e56aef178
Author: Vincent Bonamy <vbonamy@gmail.com>
Date:   Mon Jan 21 11:48:06 2013 +0100

    MAJ README ESUP : esup.properties - simple renommage de propriétés de configuration lda

commit fe754564d9562ae40431507d05a6d5354265e83d
Author: Vincent Bonamy <vbonamy@gmail.com>
Date:   Wed Dec 12 16:38:11 2012 +0100

    Update README : git clone with read-only access

commit 7b39fedb27a656eac4a6c2b13b57e79dfa3cb80b
Author: Vincent Bonamy <vbonamy@gmail.com>
Date:   Fri Dec 7 09:47:36 2012 +0100

    README -> README-JASIG ; README.esup -> README

commit e999d58c61c357fdd19d5c38e7f7c75f6eaa0c4e
Author: Drew Wills <wills.drew@gmail.com>
Date:   Tue Oct 2 14:35:04 2012 -0700

    NOJIRA:  Correct outdated info in the README

git tag -a v1.4 -m 'my version 1.4'

git reset HEAD^                                      # Annule le dernier commit
git reset HEAD^^                                     # Annule l'avant-dernier commit
git reset HEAD~2                                     # Annule l'avant-dernier commit (notation équivalente)
git reset d6d98923868578a7f38dea79833b56d0326fcba1   # Annule un numéro de commit précis ;

Unstaged changes after reset:
M       README