mirror of
https://gitlab.com/ric_harvey/git-guide.git
synced 2024-11-23 12:24:02 +00:00
add diagrams and tagging info
This commit is contained in:
parent
4a52040a0a
commit
2d9de822b7
1 changed files with 33 additions and 0 deletions
33
commit.md
33
commit.md
|
@ -112,6 +112,39 @@ If you have no merge conflicts all will be good and the code will now appear in
|
|||
|
||||
> If you do have a **merge conflict** we'll deal with this in the [merging](./merging.md) file.
|
||||
|
||||
If you want to visualise this on your git diagram what you've done is effectively this:
|
||||
|
||||
```marmaid
|
||||
gitGraph
|
||||
commit id: "first commit"
|
||||
commit id: "updates"
|
||||
```
|
||||
|
||||
### Tagging
|
||||
|
||||
Now you have a release lets look at how you tag that commit as a particular version. Here we turn your current version into a **v1.0** tag.
|
||||
|
||||
```bash
|
||||
git tag -a v1.0 -m "my version 1.0"
|
||||
```
|
||||
|
||||
This is effectively what happens in your git branch.
|
||||
|
||||
```marmaid
|
||||
gitGraph
|
||||
commit id: "first commit"
|
||||
commit id: "updates" tag: "v1.0"
|
||||
```
|
||||
|
||||
To list your tags you can run:
|
||||
|
||||
```bash
|
||||
# list all tags
|
||||
git tag
|
||||
|
||||
# To filter tags to a certain string
|
||||
git tag -l "v1.*"
|
||||
```
|
||||
---
|
||||
##### Follow me for more guides
|
||||
|
||||
|
|
Loading…
Reference in a new issue