Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Merging a tagged commit into a branch
- git merge --no-ff -m "Released v1.1.0.1 to master." v1.1.0.1
- david@davids-imac:~/t (master) $ git --version
- git version 1.7.5.4
- 3.2.48(1)-release (x86_64-apple-darwin11)
- david@davids-imac:~/t $ git init
- Initialized empty Git repository in /Users/david/t/.git/
- david@davids-imac:~/t (master #) $ echo "hi" > t
- david@davids-imac:~/t (master #%) $ git add t
- david@davids-imac:~/t (master #) $ git commit -m 'added t'
- [master (root-commit) 5f959d8] added t
- 1 files changed, 1 insertions(+), 0 deletions(-)
- create mode 100644 t
- david@davids-imac:~/t (master) $ git checkout -b branch1
- Switched to a new branch 'branch1'
- david@davids-imac:~/t (branch1) $ echo "hello" > hello
- david@davids-imac:~/t (branch1 %) $ git add .
- david@davids-imac:~/t (branch1 +) $ git commit -m 'added hello'
- [branch1 affb79a] added hello
- 1 files changed, 1 insertions(+), 0 deletions(-)
- create mode 100644 hello
- david@davids-imac:~/t (branch1) $ git tag v1.1.0.1
- david@davids-imac:~/t (branch1) $ git checkout master
- Switched to branch 'master'
- david@davids-imac:~/t (master) $ echo "yo" > yo
- david@davids-imac:~/t (master %) $ git add .
- david@davids-imac:~/t (master +) $ git commit -m 'added yo'
- [master 93b09c4] added yo
- 1 files changed, 1 insertions(+), 0 deletions(-)
- create mode 100644 yo
- david@davids-imac:~/t (master) $ git log
- commit 93b09c421e1939e3e85738fd5bd4d03b6429e729
- Author: David Brown <david@davtar.org>
- Date: Wed Mar 14 20:24:13 2012 -0600
- added yo
- commit 5f959d85a3059c189121c2b8687788c4384f9e6a
- Author: David Brown <david@davtar.org>
- Date: Wed Mar 14 20:23:01 2012 -0600
- added t
- david@davids-imac:~/t (master) $ git merge --no-ff -m "Released v1.1.0.1 to master." v1.1.0.1
- Merge made by recursive.
- hello | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
- create mode 100644 hello
- david@davids-imac:~/t (master) $ git log
- commit ac2c62b86c3e631aeda27be601fcc92a9df61146
- Merge: 93b09c4 affb79a
- Author: David Brown <david@davtar.org>
- Date: Wed Mar 14 20:24:34 2012 -0600
- Released v1.1.0.1 to master.
- commit 93b09c421e1939e3e85738fd5bd4d03b6429e729
- Author: David Brown <david@davtar.org>
- Date: Wed Mar 14 20:24:13 2012 -0600
- added yo
- commit affb79a9d72732b3250b7dca9cc8085b6f36faff
- Author: David Brown <david@davtar.org>
- Date: Wed Mar 14 20:23:30 2012 -0600
- added hello
- commit 5f959d85a3059c189121c2b8687788c4384f9e6a
- Author: David Brown <david@davtar.org>
- Date: Wed Mar 14 20:23:01 2012 -0600
- added t
Add Comment
Please, Sign In to add comment