Git

For those familiar with Git terminology:

The simplest way to assemble a triangular workflow is to set the branch’s merge key to a different branch name, like so:

[branch “branch”]
   remote = origin
   merge = refs/heads/default

This will result in the branch pullRef as origin/default, but pushRef as origin/branch, as shown in Figure 9.

Working with triangular forks requires a bit more customization than triangular branches because we are dealing with multiple remotes. […]

Hi, folks! I'm trying to send commits from origin to another branch:

git push -uf origin foo2

Then I gets it:

branch 'foo' set up to track 'origin/foo2'.

But when I'm trying to do this:

git push -uf origin origin/foo2

It writes me:

Everything up-to-date

And commits don't be sent.

Now I'm using 'foo' branch.

And the list of changes:

changed: scripts/file1.gd

changed: scripts/file2.gd

changed: scripts/file3.gd

Is still not empty. After I sends commits - nothing changes.

I don't know what do I do wrong. Can you help me? 🤷🏻‍♂️

What are the chances of the parent also beginning with seven zeroes?

I suspected author or commit date manipulation. But the commits look entirely like normal commits. So it must be pure chance?

• 00000003dd63b4c5af111a31269ed8a18d0823fa
• 0000000ae6a4e242e802c943f465373b70b07469

Headlines:

• Faster packing with name-hash v2
• Backfill historical blobs in partial clones

Followed by some more technical notes.

Hi there, we are a small tram of social researchers working on writing a collective report together. The report has several chapters. Our plan is to use git to store changes and easily traceback to different versions as well as allowing everyone to experiment with new ideas.

I am trying to decide a branching strategy, and so far I guess something like feature branching could do. We could have a branch for each chapter..? And maybe, when a chapter is kind ready, we could merge into main..?

We will have members working potentially on different parts of the report in different moments.

Advice is needed. Thank you!

I was trying to learn git and after searching a bit, I finally found some good open-source tutorials. Specifically, I followed those two tutorials, in this order:

1. https://ohmygit.org/ (a computer application)
2. https://learngitbranching.js.org/ (a website)

The second seems to cover a bit more advanced topics (it teaches more thoroughly about remote repositories)

Also after an alternativeto search and a post here, I found three more open-source resources:

1. https://www.gitmastery.me/ (a modern website)
2. https://github.com/vishal2376/git-coach (an android application covering the very very basics)
3. https://github.com/jlord/git-it-electron (An old computer application)

PS. Prior to these I had a basic git course, which I think wasn't enough, but probably helped me either way and after this I had checked some git resources, which gave more of a rounded knowledge about git and I think are worth metnioning:

1. https://jdsalaro.com/tutorial/git/index.html (this person is here on lemmy too)
2. https://tom.preston-werner.com/2009/05/19/the-git-parable.html
3. https://missing.csail.mit.edu/
4. https://docs.codeberg.org/git/clone-commit-via-cli/
5. https://github.com/SimonSchubert/LinuxCommandLibrary

Lastly, there's the pro git book as well for anyone who wants to go even deeper: https://git-scm.com/book/en/v2