License

[o0101]

No description provided.

[OneDeuxTriSeiGo]

I'm coming over from HN. Just signed the CLA with my github acct. Just took a quick glance and it looks good to me.

[o0101]

Thank you friend! @OneDeuxTriSeiGo ! I probably should have waited, but I just wanted to use it so much. It was very good. I'm sorry! 😬 😊

[o0101]

If you want to amend the commit author to yourself for these commits and sign them with your key, I'd like that. Because it's right that you're a contributor, @OneDeuxTriSeiGo ! :)

[OneDeuxTriSeiGo]

Oh thank you.

Given that it might break the signatures for the commit afterwards (unless you then resign the commit after 2bb86c2), it might be easier to just have the following appended to the bottom of the commit message for 2bb86c2. That should properly mark attribution as github should pick up on it and tag me accordingly.

Co-authored-by: Jacob Abel <jacobabel@nullpo.dev>

[o0101]

Hey @OneDeuxTriSeiGo I don't know how to do that, sorry! Would you be able to help? My idea was you could just amend the author on the relevant commits but I tried doing that in rebase and borked it, so I had to undo. Sorry! :)

Would it be a bad idea if you helped? I don't know what I'm doing here. But I would like to have you as a contributor.

Also another problem I faced is the commit was only partially verified because it was not signed by you. That may be an issue going forward as we need to have verified history. Anyway! :)

[OneDeuxTriSeiGo]

ahhhh that's interesting I hadn't seen that notice before. I think it might be because it's amended to the merge without my signature on any of the branch's commits. ya I'll spin up a fork real quick and see if I can wrangle the branch into cooperating on my end. I'll reply back when I'm done.

[OneDeuxTriSeiGo]

okay i invited you to my fork. can you pull down the license branch and do git commit --amend -s to reset the signature of the last commit and then force push it back up to my fork?

[o0101]

Ok! Will do a bit later. Tired now! :)

[o0101]

OK I think I've done that 16c96ca! Let me know @OneDeuxTriSeiGo :)

[OneDeuxTriSeiGo]

Perfect. So first I'm going to need you to make a new branch based on the boss branch.

Then run git rebase --rebase-merges=rebase-cousins -i HEAD~3 on that new branch.

Your editor should pop up and you'll need to change the commit hashes for the 2 changed commits as shown below.

label onto

# Branch dosyago-license
reset onto
pick bd2d45b Switch GPL -> AGPL
- pick 2bb86c2 Adding license revisions.
+ pick 3c75c56 Adding license revisions.
- pick 07c083a Clarify in install guard
+ pick 16c96ca Clarify in install guard
label dosyago-license

# Branch dosyago-license-2
reset dosyago-license # Clarify in install guard
pick b7ab27b Txt to MD
label dosyago-license-2

# Branch dosyago-00000o1-patch-1
reset onto
merge -C e92a4bf dosyago-license # Merge pull request #240 from dosyago/license
merge -C 3c5a670 dosyago-license-2 # Merge pull request #241 from dosyago/license
label branch-point
pick d3b7650 Update README.md
label dosyago-00000o1-patch-1

reset branch-point # Merge pull request #241 from dosyago/license
merge -C 14de59f dosyago-00000o1-patch-1 # Merge pull request #243 from dosyago/00000o1-patch-1

# Rebase d2f14b5..14de59f onto d2f14b5 (17 commands)

Then save and exit your editor. Provided it was done correctly, the rebase should automatically complete. If you can push that up somewhere (other than to the main boss branch) I can verify that everything came through in one piece.

After that you should be able to force push that to the boss branch and it should be done.

[o0101]

Wow, I'm so glad you're an expert at this stuff! This is awesome, thanks! :) I'll get to it in a little bit. I'm a little bit tired now.

[o0101]

Hey @OneDeuxTriSeiGo ! I've added the new-collab branch to your fork and followed your instructions. Super cool! That you can do this amazing! :)

[OneDeuxTriSeiGo]

Yeah it's a neat trick that can come in handy some times. If you give it any sequence of commit hashes, it'll try to use those to rebuild the history. Now worth noting it doesn't always work cleanly but it generally works well and since it's git, if you make a mistake you can always undo it.

[OneDeuxTriSeiGo]

I took a look at the new-collab branch and it looks good.

You might want to make sure any tests are run just to be on the safe side but doing git diff against boss (prior to your most recent commit just now) shows identical changes and checking the trees indicates that the commits all came through in the same structure. You can verify this by putting the two commands below up side by side each other

git log --graph --decorate boss~1
git log --graph --decorate new-collab

Now all you should need to do is switch over to the boss branch and rebase the new commit you added onto the changes you did in new-collab:

git rebase -i HEAD~1 --onto new-collab

When doing this you should only see the one new commit listed. Something like:

pick 295f5ac Update LICENSE.md (#248)

# Rebase c851f4b..295f5ac onto c851f4b (1 command)

Then save and exit the editor and the rebase should go cleanly. You can verify this with git diff boss origin/boss and by comparing the commit trees with:

git log --graph --decorate boss
git log --graph --decorate origin/boss

Now all that's left is to force push boss back up to github.

[o0101]

Sorry @OneDeuxTriSeiGo got kind of swamped the last few days and lost track of this. Thanks for being so patient with me here. I'll jump into this now! :)

[o0101]

And it's done! Thank you, @OneDeuxTriSeiGo -- the wait was certainly worth it (for me at least!). To check out those cool git commands (--graph and --decorate 🔥), it really helped me out, man! Thanks for teaching me something, I really appreciate it.

Drop by anytime. I'm proud to say your name is now among the contribs! :)