Skip to content

Commit 13136ff

Browse files
TheSnoozerTheSnoozer
committed
redo the _git_with_submodules_and_multiple_commits; this time with different authors
1 parent b2197a9 commit 13136ff

47 files changed

Lines changed: 18 additions & 7 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎_git_with_submodules_and_multiple_commits/AUTO_MERGE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dc9b379bcb00090e30ecc32780daa5c82fe31f57

‎_git_with_submodules_and_multiple_commits/COMMIT_EDITMSG‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a change in the root pom
1+
a change in submodule-two

_git_with_submodules_and_multiple_commits/refs/heads/master renamed to _git_with_submodules_and_multiple_commits/ORIG_HEAD

File renamed without changes.

‎_git_with_submodules_and_multiple_commits/index‎

0 Bytes
Binary file not shown.

‎_git_with_submodules_and_multiple_commits/info/refs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2ed2ea209fb99c360cd8434eb2d82b929da6b908 refs/heads/master

‎_git_with_submodules_and_multiple_commits/logs/HEAD‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,10 @@
22
9c5d2e13d042b0acb71c48232a9c408e42da87f7 8e88956d45d57725463550f4406a54d12a46ae78 TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774629563 +0100 commit: a change in submodule-one
33
8e88956d45d57725463550f4406a54d12a46ae78 2b91f8b730121f66a833f771cb7241919fed5917 TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774629599 +0100 commit: a change in submodule-two
44
2b91f8b730121f66a833f771cb7241919fed5917 4862e42508099d359d791269f3735baff36d9102 TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774629636 +0100 commit: a change in the root pom
5+
4862e42508099d359d791269f3735baff36d9102 9c5d2e13d042b0acb71c48232a9c408e42da87f7 TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774694826 +0100 rebase (start): checkout 9c5d2e13d042b0acb71c48232a9c408e42da87f7
6+
9c5d2e13d042b0acb71c48232a9c408e42da87f7 8e88956d45d57725463550f4406a54d12a46ae78 TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774694826 +0100 rebase: fast-forward
7+
8e88956d45d57725463550f4406a54d12a46ae78 91e49245092c089624d3e770d902cfc8bc53a852 TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774694871 +0100 commit (amend): a change in submodule-one
8+
91e49245092c089624d3e770d902cfc8bc53a852 a4f5adff89dd79560d58085e047b0fa531986f25 TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774694878 +0100 rebase (edit): a change in submodule-two
9+
a4f5adff89dd79560d58085e047b0fa531986f25 70a13b95591dac76ce92dd9087d557fca539f98a TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774694897 +0100 commit (amend): a change in submodule-two
10+
70a13b95591dac76ce92dd9087d557fca539f98a 2ed2ea209fb99c360cd8434eb2d82b929da6b908 TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774694906 +0100 rebase (pick): a change in the root pom
11+
2ed2ea209fb99c360cd8434eb2d82b929da6b908 2ed2ea209fb99c360cd8434eb2d82b929da6b908 TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774694906 +0100 rebase (finish): returning to refs/heads/master

‎_git_with_submodules_and_multiple_commits/logs/refs/heads/master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
9c5d2e13d042b0acb71c48232a9c408e42da87f7 8e88956d45d57725463550f4406a54d12a46ae78 TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774629563 +0100 commit: a change in submodule-one
33
8e88956d45d57725463550f4406a54d12a46ae78 2b91f8b730121f66a833f771cb7241919fed5917 TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774629599 +0100 commit: a change in submodule-two
44
2b91f8b730121f66a833f771cb7241919fed5917 4862e42508099d359d791269f3735baff36d9102 TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774629636 +0100 commit: a change in the root pom
5+
4862e42508099d359d791269f3735baff36d9102 2ed2ea209fb99c360cd8434eb2d82b929da6b908 TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> 1774694906 +0100 rebase (finish): refs/heads/master onto 9c5d2e13d042b0acb71c48232a9c408e42da87f7

‎_git_with_submodules_and_multiple_commits/objects/0a/a62b9480614dd66ec9ed04be10e0e252cedca1‎

-81 Bytes
Binary file not shown.

‎_git_with_submodules_and_multiple_commits/objects/20/d2f1f8e022d31b315d69b09777846e5b1dc22d‎

-51 Bytes
Binary file not shown.

‎_git_with_submodules_and_multiple_commits/objects/2b/91f8b730121f66a833f771cb7241919fed5917‎

-189 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)