LinuxBBQ

dkeg wrote:disclaimer, I'm sure Joe would have a more proper tutorial for this.

Generally speaking ... we're looking at two separate things here, using git locally and with a service such as GitHub or Bitbucket.
Using locally:

Code: Select all

sudo apt-get install git

initialize the directory, add the items, commit

Code: Select all

cd /dir/for/git
git init
git add -A 
#above is all to add all items. You can add specific items too
git add file1 file2 file3
git commit -m 'm is for message, add your message here'
git status #check current status

First things first, create you ssh key

Code: Select all

ssh keygen -t rsa "email"

Copy the public key and use that for your key in GitHub/Bitbucket

Code: Select all

cd ~/.ssh
<editor> id_rsa.pub

Connecting with a remote server. Pretty much the same as above, of course we need to specify our remote location

Code: Select all

cd /dir/for/git
git remote add origin [email protected]:gituser/reponame.git
git push origin master

When we push origin master, we push up to our remote GitHub account.

When you are happy with you current state, you can create a branch, and work off the branch.

Code: Select all

git branch <branchname>

Move to the new branch

Code: Select all

git checkout <branchname>

Create and move to all in one

Code: Select all

git checkout -b <branchname>

Now you can do all your work on the branch, when you're happy, commit and merge it with master

Code: Select all

git commit -m 'commit message'
git checkout master
# check the current working branch
git branch
git merge <branchname>

You can either keep the branch or delete

Code: Select all

 git branch -d <branchname>

For cloning a repo

Code: Select all

git clone [email protected]:gituser/reponame.git
cd reponame
# track it
git remote add upstream git://github.com/gituser/reponame.git
git fetch upstream
# I generally do
git pull

To help keep my clones organized I create a git directory

Code: Select all

mkdir git
cd git
git clone .....
be happy and organized

Other cool stuff

Code: Select all

git diff
git log --graph

More disclaimer, please don't by shy about questions. Again, I am not a pro at this, its mainly from what I've picked up from personal use. There is obviously so much more that can be done, and possibly better ways to do stuff. For my configs and such I generally don't branch, but when I was coding, I would definitely branch.

Hopefully I didn't leave anything important out.

Edit: IIRC when you add a remote origin,if its added as https, not ssh. You can change that with set-url

Code: Select all

git remote set-url origin [email protected]:gituser/reponame.git

signingKey = <your-public-key-id>

gpg --list-public-keys

git commit -S -m <your commit message>

-S[<keyid>], --gpg-sign[=<keyid>]
GPG-sign commit.

GekkoP wrote:Git lets you GPG sign your commits. Not a bad thing, so this is what's needed:

GekkoP wrote: As long as you have your GPG key already set up, add this line to your ~/.gitconfig or ~/.config/git/config:

Code: Select all

signingKey = <your-public-key-id>

You can find out the key-id using:

Code: Select all

gpg --list-public-keys

It's the one after the "/" on the line that starts with "pub".

git config --global user.signingkey <your-public-key-id>