Skip to content

Latest commit

 

History

History
58 lines (36 loc) · 1.45 KB

GIT-README.md

File metadata and controls

58 lines (36 loc) · 1.45 KB

GIT README

Shortcuts to recurrent Git commands

Sync remote fork

git fetch public
git checkout master
git merge public/master

Read more here.

Subtree

The tests directory is a Git subtree created with the following commands:

git remote add tests [email protected]:nextflow-io/tests.git
git subtree add --squash --prefix=tests/ tests integration

To pull changes from the tests repo use this command:

git subtree pull --squash --prefix=tests/ tests integration

To push changes to to tests repo use this command:

git subtree push --prefix=tests/ tests integration

Read more here.

Stash shortcuts

git stash list
git stash pop
git stash pop stash@{1}
git stash drop
git stash drop stash@{1}
git stash clear
git diff stash
git diff stash@{1} [other]

GPG keys

To sign Git commits with a GPG key on Mac use GPG Suite, import your key, then:

git config --global gpg.program /usr/local/MacGPG2/bin/gpg2
git config --global user.signingkey <your key> 
git config --global commit.gpgsign true 
git config --global format.signoff true ## TO AVOID TO SPECIFY -S option each time

Read more: https://gist.github.com/danieleggert/b029d44d4a54b328c0bac65d46ba4c65