Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- #####################################################################
- ## The following represents the history prior to the no-ff merge.. ##
- #####################################################################
- me@mine:~/the/repo
- commit 641340eaa15bb25d52cbbb9efb12d19eeb7c848a (master)
- Author: me
- Date: Mon Jul 6 16:46:22 2020 -0700
- m2
- commit 3a01fc419ab301cd044ce1953f1510dfb655f38c
- Author: me
- Date: Mon Jul 6 16:43:31 2020 -0700
- m1
- commit ac6624ac1578d8741b86de4fd9d458c40dabca91
- Author: me
- Date: Mon Jul 6 16:43:12 2020 -0700
- m0
- commit e7dd7512e73426877f267bdf60a58ffdb0008f99
- Author: me
- Date: Mon Jul 6 16:42:06 2020 -0700
- Initializing empty repository.
- me@mine:~/the/repo
- commit a91e5ecd37a115329a67fd68ab49c607f2d85736 (HEAD -> feature)
- Author: me
- Date: Mon Jul 6 16:47:09 2020 -0700
- f2
- commit 47f2cfb994e7608c385ae381716bff6fa9b7a71a
- Author: me
- Date: Mon Jul 6 16:45:18 2020 -0700
- f1
- commit 49ebe1674168a9ae4e68980490eb264e017c1741
- Author: me
- Date: Mon Jul 6 16:44:53 2020 -0700
- f0
- commit 3a01fc419ab301cd044ce1953f1510dfb655f38c
- Author: me
- Date: Mon Jul 6 16:43:31 2020 -0700
- m1
- commit ac6624ac1578d8741b86de4fd9d458c40dabca91
- Author: me
- Date: Mon Jul 6 16:43:12 2020 -0700
- m0
- commit e7dd7512e73426877f267bdf60a58ffdb0008f99
- Author: me
- Date: Mon Jul 6 16:42:06 2020 -0700
- Initializing empty repository.
- me@mine:~/the/repo
- #####################################################################
- ## The following shows the merge and the history after the merge.. ##
- #####################################################################
- me@mine:~/the/repo
- Switched to branch 'master'
- me@mine:~/the/repo
- Merge made by the 'recursive' strategy.
- f | 3 +++
- 1 file changed, 3 insertions(+)
- create mode 100644 f
- me@mine:~/the/repo
- commit a40a4dbe589c55ab0efbdcd52cc05a9eb59582c0 (HEAD -> master)
- Merge: 641340e a91e5ec
- Author: me
- Date: Mon Jul 6 16:51:31 2020 -0700
- Merge branch 'feature' with --no-ff merge.
- commit a91e5ecd37a115329a67fd68ab49c607f2d85736 (feature)
- Author: me
- Date: Mon Jul 6 16:47:09 2020 -0700
- f2
- commit 641340eaa15bb25d52cbbb9efb12d19eeb7c848a
- Author: me
- Date: Mon Jul 6 16:46:22 2020 -0700
- m2
- commit 47f2cfb994e7608c385ae381716bff6fa9b7a71a
- Author: me
- Date: Mon Jul 6 16:45:18 2020 -0700
- f1
- commit 49ebe1674168a9ae4e68980490eb264e017c1741
- Author: me
- Date: Mon Jul 6 16:44:53 2020 -0700
- f0
- commit 3a01fc419ab301cd044ce1953f1510dfb655f38c
- Author: me
- Date: Mon Jul 6 16:43:31 2020 -0700
- m1
- commit ac6624ac1578d8741b86de4fd9d458c40dabca91
- Author: me
- Date: Mon Jul 6 16:43:12 2020 -0700
- m0
- commit e7dd7512e73426877f267bdf60a58ffdb0008f99
- Author: me
- Date: Mon Jul 6 16:42:06 2020 -0700
- Initializing empty repository.
- me@mine:~/the/repo
- commit a91e5ecd37a115329a67fd68ab49c607f2d85736 (feature)
- Author: me
- Date: Mon Jul 6 16:47:09 2020 -0700
- f2
- commit 47f2cfb994e7608c385ae381716bff6fa9b7a71a
- Author: me
- Date: Mon Jul 6 16:45:18 2020 -0700
- f1
- commit 49ebe1674168a9ae4e68980490eb264e017c1741
- Author: me
- Date: Mon Jul 6 16:44:53 2020 -0700
- f0
- commit 3a01fc419ab301cd044ce1953f1510dfb655f38c
- Author: me
- Date: Mon Jul 6 16:43:31 2020 -0700
- m1
- commit ac6624ac1578d8741b86de4fd9d458c40dabca91
- Author: me
- Date: Mon Jul 6 16:43:12 2020 -0700
- m0
- commit e7dd7512e73426877f267bdf60a58ffdb0008f99
- Author: me
- Date: Mon Jul 6 16:42:06 2020 -0700
- Initializing empty repository.
- me@mine:~/the/repo
Add Comment
Please, Sign In to add comment