git-merge-lw-tag.txt

[straussd@athena merge-tag]$ git checkout new-branch 
Switched to branch 'new-branch'
[straussd@athena merge-tag]$ echo "Yet another file" > newbranchfile.txt
[straussd@athena merge-tag]$ git add newbranchfile.txt 
[straussd@athena merge-tag]$ git commit -m"Another change to the branch."
[new-branch af871b2] Another change to the branch.
 1 file changed, 1 insertion(+)
 create mode 100644 newbranchfile.txt
[straussd@athena merge-tag]$ git checkout master
Switched to branch 'master'
[straussd@athena merge-tag]$ echo "Yet another file" > newmasterfile.txt
[straussd@athena merge-tag]$ git add newmasterfile.txt 
[straussd@athena merge-tag]$ git commit -m"Another change to master."
[master f4efff8] Another change to master.
 1 file changed, 1 insertion(+)
 create mode 100644 newmasterfile.txt
[straussd@athena merge-tag]$ git checkout new-branch 
Switched to branch 'new-branch'
[straussd@athena merge-tag]$ git tag v1.4-lw
[straussd@athena merge-tag]$ git checkout master
Switched to branch 'master'
[straussd@athena merge-tag]$ git merge v1.4-lw
Merge made by the 'recursive' strategy.
 newbranchfile.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 newbranchfile.txt
[straussd@athena merge-tag]$ git log --graph
*   commit 156db7bde5fda78a3ce4a5615793912963803c7d
|\  Merge: f4efff8 af871b2
| | Author: David Strauss <[email protected]>
| | Date:   Thu Jun 16 09:30:27 2016 -0700
| | 
| |     Merge tag 'v1.4-lw'
| |   
| * commit af871b2d8c6efe519d9bc0c29f5e5692c8cd778d
| | Author: David Strauss <[email protected]>
| | Date:   Thu Jun 16 09:29:18 2016 -0700
| | 
| |     Another change to the branch.
| |   
* | commit f4efff8088cd511e073fb0a24e223966f7fc0d63
| | Author: David Strauss <[email protected]>
| | Date:   Thu Jun 16 09:29:37 2016 -0700
| | 
| |     Another change to master.
| |     
* |   commit 9dcf4368a2fbae20d5c9fb1ad7e96af3ee27db43
|\ \  Merge: 1b1ccd6 742ca70
| |/  Author: David Strauss <[email protected]>
| |   Date:   Thu Jun 16 09:23:04 2016 -0700
| |   
| |       Merge tag 'mytag'
| |       
| |       New tag.
| |   
| * commit 742ca70565bd06591534d21ae14cabc2ad0ac061
| | Author: David Strauss <[email protected]>
| | Date:   Thu Jun 16 09:22:33 2016 -0700
| | 
| |     Added file to branch.
| |   
* | commit 1b1ccd6403a3d322339ec24223b42a26480b3ce2
|/  Author: David Strauss <[email protected]>
|   Date:   Thu Jun 16 09:23:01 2016 -0700
|   
|       Added file to master
|  
* commit 2e4ed5967174a6f0ef789109f38b027d19e4a274
  Author: David Strauss <[email protected]>
  Date:   Thu Jun 16 09:19:48 2016 -0700
  
      Init