Procédure pour merger la branche d'un repo distant.

Admettons que je travaille sur https://github.com/UtahDave/salt-vagrant-demo
"""
$ git clone https://github.com/UtahDave/salt-vagrant-demo.git
$ cd salt-vagrant-demo
"""
Je veux merger la branche 'vagrant_1.7.4' du fork https://github.com/cjhenck/salt-vagrant-demo qui intègre le patch qui m’intéresse dans ma branche 'master' locale.

J'ajoute le remote en indiquant la branche qui m'interesse avec -t. 'patch-vagrant-1.7.4' est ici une sorte de tag que je donne au remote.
"""
$ git remote add patch-vagrant-1.7.4 -t vagrant_1.7.4 https://github.com/cjhenck/salt-vagrant-demo.git
"""
Je me mets sur ma branche locale master si je n'y suis pas déja
"""
$ git checkout master
"""
Je merge le remote, que j'ai précédemment taggué 'patch-vagrant-1.7.4', dans master:
"""
$ git pull patch-vagrant-1.7.4 master
"""

En guise d'aide mémoire perso, voici une petite collection des principaux (selon moi) articles qui concernent ces révélations :

NSA whistleblower Edward Snowden: 'I don't want to live in a society that does these sort of things' – video

http://www.guardian.co.uk/world/video/2013/jun/09/nsa-whistleblower-edward-snowden-interview-video

NSA Prism program taps in to user data of Apple, Google and others

http://www.guardian.co.uk/world/2013/jun/06/us-tech-giants-nsa-data

The NSA slide you haven’t seen (celui-ci concerne l'écoute des fibres sous-marines)

http://www.washingtonpost.com/business/economy/the-nsa-slide-you-havent-seen/2013/07/10/32801426-e8e6-11e2-aa9f-c03a72e2d342_story.html

How Microsoft handed the NSA access to encrypted messages

http://www.guardian.co.uk/world/2013/jul/11/microsoft-nsa-collaboration-user-data

Snowden confirms NSA created Stuxnet with Israeli aid

http://rt.com/news/snowden-nsa-interview-surveillance-831/

GCHQ taps fibre-optic cables for secret access to world's communications

http://www.guardian.co.uk/uk/2013/jun/21/gchq-cables-secret-world-communications-nsa

Obama administration convinced EU to drop measure that would have blocked NSA spying

http://www.washingtonpost.com/blogs/worldviews/wp/2013/06/12/obama-administration-convinced-eu-to-drop-measure-that-would-have-blocked-nsa-spying/

XKeyscore: NSA tool collects 'nearly everything a user does on the internet'

http://www.theguardian.com/world/2013/jul/31/nsa-top-secret-program-online-data

NSA pays £100m in secret funding for GCHQ

http://www.theguardian.com/uk-news/2013/aug/01/nsa-paid-gchq-spying-edward-snowden

News à part :

German spy-spotter attracts unwanted attention for NSA protest walk

http://www.dw.de/german-spy-spotter-attracts-unwanted-attention-for-nsa-protest-walk/a-16954894

Wikipedia :
https://en.wikipedia.org/wiki/2013_mass_surveillance_disclosures