Fixing previous post file names and my name in them
This commit is contained in:
parent
6f0596c2e0
commit
b528ffd2f4
4 changed files with 15 additions and 15 deletions
|
@ -5,7 +5,7 @@
|
||||||
.. status: published
|
.. status: published
|
||||||
.. tags: git, revision-control
|
.. tags: git, revision-control
|
||||||
.. category: revision-control
|
.. category: revision-control
|
||||||
.. authors: Elijah Lazkani
|
.. authors: Elia El Lazkani
|
||||||
.. description: Explaining branches, branching and merging strategies.
|
.. description: Explaining branches, branching and merging strategies.
|
||||||
.. type: text
|
.. type: text
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ Alright, let's test our hypothesis.
|
||||||
commit 643a353370d74c26d7cbf5c80a0d73988a75e09e (HEAD -> mybranch, master)
|
commit 643a353370d74c26d7cbf5c80a0d73988a75e09e (HEAD -> mybranch, master)
|
||||||
Author: John Doe <johndoe@example.com>
|
Author: John Doe <johndoe@example.com>
|
||||||
Date: Thu Aug 1 19:50:45 2019 +0200
|
Date: Thu Aug 1 19:50:45 2019 +0200
|
||||||
|
|
||||||
Second commit
|
Second commit
|
||||||
|
|
||||||
The commit is, of course, different because this is a different computer with a different repository from scratch. Anyway, it seems from the log message that both *mybranch* and *master* are pointing to same commit ``SHA``. Technically they are pointing to **HEAD**.
|
The commit is, of course, different because this is a different computer with a different repository from scratch. Anyway, it seems from the log message that both *mybranch* and *master* are pointing to same commit ``SHA``. Technically they are pointing to **HEAD**.
|
||||||
|
@ -60,7 +60,7 @@ Now let's continue and add a new commit.
|
||||||
|
|
||||||
.. code:: text
|
.. code:: text
|
||||||
|
|
||||||
$ echo "" >> README.md
|
$ echo "" >> README.md
|
||||||
$ git add README.md
|
$ git add README.md
|
||||||
$ git commit -m "Adding an empty line"
|
$ git commit -m "Adding an empty line"
|
||||||
[mybranch b30f4e0] Adding an empty line
|
[mybranch b30f4e0] Adding an empty line
|
||||||
|
@ -80,7 +80,7 @@ After this last commit, let's check the log
|
||||||
commit 643a353370d74c26d7cbf5c80a0d73988a75e09e (master)
|
commit 643a353370d74c26d7cbf5c80a0d73988a75e09e (master)
|
||||||
Author: John Doe <johndoe@example.com>
|
Author: John Doe <johndoe@example.com>
|
||||||
Date: Thu Aug 1 19:50:45 2019 +0200
|
Date: Thu Aug 1 19:50:45 2019 +0200
|
||||||
|
|
||||||
Second commit
|
Second commit
|
||||||
|
|
||||||
From reading the output of log, we can see that the *master* branch points to a different commit than *mybranch*.
|
From reading the output of log, we can see that the *master* branch points to a different commit than *mybranch*.
|
||||||
|
@ -101,7 +101,7 @@ What the above suggests is that our two branches have different contents at this
|
||||||
Switched to branch 'master'
|
Switched to branch 'master'
|
||||||
$ cat README.md
|
$ cat README.md
|
||||||
# Example
|
# Example
|
||||||
|
|
||||||
This is an example repository.
|
This is an example repository.
|
||||||
This repository is trying to give you a hands on experience with git to complement the post.
|
This repository is trying to give you a hands on experience with git to complement the post.
|
||||||
$
|
$
|
||||||
|
@ -114,7 +114,7 @@ And if we switch back to *mybranch*.
|
||||||
Switched to branch 'mybranch'
|
Switched to branch 'mybranch'
|
||||||
$ cat README.md
|
$ cat README.md
|
||||||
# Example
|
# Example
|
||||||
|
|
||||||
This is an example repository.
|
This is an example repository.
|
||||||
This repository is trying to give you a hands on experience with git to complement the post.
|
This repository is trying to give you a hands on experience with git to complement the post.
|
||||||
|
|
||||||
|
@ -150,7 +150,7 @@ Let's also check the difference between our *master* branch and *mybranch*.
|
||||||
--- a/README.md
|
--- a/README.md
|
||||||
+++ b/README.md
|
+++ b/README.md
|
||||||
@@ -2,3 +2,5 @@
|
@@ -2,3 +2,5 @@
|
||||||
|
|
||||||
This is an example repository.
|
This is an example repository.
|
||||||
This repository is trying to give you a hands on experience with git to complement the post.
|
This repository is trying to give you a hands on experience with git to complement the post.
|
||||||
+
|
+
|
||||||
|
@ -192,19 +192,19 @@ As we can see. The changes in *mybranch* have been merged into the *master* bran
|
||||||
commit f25dd5da3e6f91d117177782a5811d5086f66799 (HEAD -> master, mybranch)
|
commit f25dd5da3e6f91d117177782a5811d5086f66799 (HEAD -> master, mybranch)
|
||||||
Author: John Doe <johndoe@example.com>
|
Author: John Doe <johndoe@example.com>
|
||||||
Date: Thu Aug 1 20:43:57 2019 +0200
|
Date: Thu Aug 1 20:43:57 2019 +0200
|
||||||
|
|
||||||
Adding more commits to mybranch
|
Adding more commits to mybranch
|
||||||
|
|
||||||
commit b30f4e0fa8f3b5c9f041c9ad1be982b2fed80851
|
commit b30f4e0fa8f3b5c9f041c9ad1be982b2fed80851
|
||||||
Author: John Doe <johndoe@example.com>
|
Author: John Doe <johndoe@example.com>
|
||||||
Date: Thu Aug 1 20:28:05 2019 +0200
|
Date: Thu Aug 1 20:28:05 2019 +0200
|
||||||
|
|
||||||
Adding an empty line
|
Adding an empty line
|
||||||
|
|
||||||
commit 643a353370d74c26d7cbf5c80a0d73988a75e09e
|
commit 643a353370d74c26d7cbf5c80a0d73988a75e09e
|
||||||
Author: John Doe <johndoe@example.com>
|
Author: John Doe <johndoe@example.com>
|
||||||
Date: Thu Aug 1 19:50:45 2019 +0200
|
Date: Thu Aug 1 19:50:45 2019 +0200
|
||||||
|
|
||||||
Second commit
|
Second commit
|
||||||
|
|
||||||
Merging Strategies
|
Merging Strategies
|
|
@ -5,7 +5,7 @@
|
||||||
.. status: published
|
.. status: published
|
||||||
.. tags: git, revision-control
|
.. tags: git, revision-control
|
||||||
.. category: revision-control
|
.. category: revision-control
|
||||||
.. authors: Elijah Lazkani
|
.. authors: Elia El Lazkani
|
||||||
.. description: Getting your feet wet with git from the beginning.
|
.. description: Getting your feet wet with git from the beginning.
|
||||||
.. type: text
|
.. type: text
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
.. status: published
|
.. status: published
|
||||||
.. tags: git, revision-control
|
.. tags: git, revision-control
|
||||||
.. category: revision-control
|
.. category: revision-control
|
||||||
.. authors: Elijah Lazkani
|
.. authors: Elia El Lazkani
|
||||||
.. description: Getting a little handle on git rebase
|
.. description: Getting a little handle on git rebase
|
||||||
.. type: text
|
.. type: text
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
.. status: published
|
.. status: published
|
||||||
.. tags: git, revision-control
|
.. tags: git, revision-control
|
||||||
.. category: revision-control
|
.. category: revision-control
|
||||||
.. authors: Elijah Lazkani
|
.. authors: Elia El Lazkani
|
||||||
.. description: Let's have a deeper look at remotes
|
.. description: Let's have a deeper look at remotes
|
||||||
.. type: text
|
.. type: text
|
||||||
|
|
Reference in a new issue