index.html

<<<<<<< HEAD
$ git checkout -b dev
Switched to a new branch "dev"

This is shorthand for:

$ git branch dev
$ git checkout dev


$ vim index.html
$ git commit -a -m 'added a new file [dev]'


$ git checkout master
Switched to branch 'master'


$ git checkout master
$ git merge dev


<<<<<<< HEAD
=======
>>>>>>> c7828c39fb806e2923e9ccce041610e7d5bb0bc1
=======
###  Listing Your Tags #####
$ git tag
>>>>>>> dev

$ git tag -l "v1.8.5*"


### Creating Tags ####

Git uses two main types of tags: lightweight and annotated.

A lightweight tag is very much like a branch that doesn’t change – it’s just a pointer to a specific commit.

Annotated tags, however, are stored as full objects in the Git database. They’re checksummed; contain the tagger name, email, and date; have a tagging message; and can be signed and verified with GNU Privacy Guard (GPG). It’s generally recommended that you create annotated tags so you can have all this information; but if you want a temporary tag or for some reason don’t want to keep the other information, lightweight tags are available too.

###### Annotated Tags ##########

Creating an annotated tag in Git is simple. The easiest way is to specify -a when you run the tag command:

$ git tag -a v1.4 -m "my version 1.4"
$ git tag
v0.1
v1.3
v1.4


$ git show v1.4-lw

$ git log --pretty=oneline

Now, suppose you forgot to tag the project at v1.2, which was at the “updated rakefile” commit. You can add it after the fact. To tag that commit, you specify the commit checksum (or part of it) at the end of the command:

$ git tag -a v1.2 9fceb02

You can see that you’ve tagged the commit:

$ git tag
v0.1
v1.2
v1.3
v1.4
v1.4-lw
v1.5

$ git show v1.2

############ Sharing Tags ##########

git push origin [tagname].


$ git push origin v1.5

############ Checking out Tags ###########

git checkout -b [branchname] [tagname]:

$ git checkout -b version2 v2.0.0
Switched to a new branch 'version2'