Topics Top articles New articles Updated articles Top users New users New discussions Top discussions New comments+ New article
Generate a minimal test repo. You should get in the habit of doing this to test stuff out.
#!/usr/bin/env bash
mkdir git-tips
cd git-tips
git init
for i in 1 2 3 4 5; do
echo $i > f
git add f
git commit -m $i
done
git checkout HEAD~2
git checkout -b my-feature
for i in 6 7; do
echo $i > f
git add f
git commit -m $i
doneFor the strong.
git log --abbrev-commit --decorate --graph --pretty=oneline master HEADOutput:
* b4ec057 (master) 5
* 0b37c1b 4
| * fbfbfe8 (HEAD -> my-feature) 7
| * 7b0f59d 6
|/
* 661cfab 3
* 6d748a9 2
* c5f8a2c 1If we also add the As we can see, this removes any commit that is neither:
--simplify-by-decoration, which you very often want want on a real repository with many commits:* b4ec057 (master) 5
| * fbfbfe8 (HEAD -> my-feature) 7
|/
* c5f8a2c 1- under a branch or tag
- at the intersection of too branches or tags
Before
7 my-feature HEAD
|
6
|
5 master
|
4
|
3
|
2
|
1Oh, commit 6 was just a temporary step, should be put together with commit 7:
git rebase -i HEAD~2Mark
6 to be squashed.After:Better now, ready to push.
67 my-feature HEAD
|
5 master
|
4
|
3
|
2
|
1Some of their archiving accounts:
The key to solve conflicts: see the two conflicting diffs by 
Ciro Santilli 35 Updated 2025-01-10 +Created 1970-01-01
Ciro Santilli 35 Updated 2025-01-10 +Created 1970-01-01The key to solve conflicts is:
You have to understand what are the two commits that touched a given line (one from master, one from features), and then combine them somehow.
Or in other words, at every rebase conflict we have something like:Therefore there are 2 diffs that you have to understand and reconcile:
master-commit feature-commit
| |
| |
base-commit------+
|
|base-committomaster-commitbase-committofeature-commit
- drive.google.com/file/d/1JTPVd09NPaGH-KzGv2jU3XXcFiJAoUjw/view some crazy due investigating, let's see how long until it goes down, posted at: Points to:"Alex Conferno" is also brought up: twitter.com/conferno
- www.reddit.com/r/DataHoarder/comments/12trawt/has_anyone_ever_actually_spoken_to_denis_petrov/
- gyrovague.com/2023/08/05/archive-today-on-the-trail-of-the-mysterious-guerrilla-archivist-of-the-internet/. Trended on Hacker News: news.ycombinator.com/item?id=37009598
- gigazine.net/gsc_news/en/20240326-archive-today/
Other mentions of "Denis Petrov":
Online forums that lock threads after some time are evil. What else needs to be said?
Sometimes it just feels like Ubuntu devs don't actually use Ubuntu as a desktop.
Some extremelly anoying problems are introduced and just never get fixed, even though they feel so obvious!
Would never happen on Mac...
Jordan Peterson's university online by Ciro Santilli 35 Updated 2025-01-10 +Created 1970-01-01
Ciro Santilli 35 Updated 2025-01-10 +Created 1970-01-01Some courses at least allow you to see material for free, e.g.: www.coursera.org/learn/quantum-optics-single-photon/lecture/UYjLu/1-1-canonical-quantization. Lots of video focus as usual for MOOCs.
Some are paywalled: www.coursera.org/learn/theory-of-angular-momentum?specialization=quantum-mechanics-for-engineers
It is extremely hard to find the course materials without enrolling, even if enrolling for free! By trying to make money, they make their website shit.
The comment section does have a lot of activity: www.coursera.org/learn/statistical-mechanics/discussions/weeks/2! Nice. And works like a proper issue tracker. But it is also very hidden.
November 2023 topics:
- quantum field theory: no
- condensed matter: 1 by Rahul Nandkishore from Colorado Boulder: www.coursera.org/specializations/the-physics-of-emergence-introduction-to-condensed-matter
A more specific type of E-learning website generally run by a specific organization.
A website, usually hosted by an university, that takes what is done in class, and pastes it online. It is already much more rational and efficient, and opens up the way for potential sharing outside of the institution (or by default paywalling as the University of Oxford did.
The fundametnal problem with VLEs is that they tend to not have enough incentives for students to contribute at all to the content. This is basically the major motivation behind OurBigBook.com.
Documents the Linux kernel. Somewhat of a competitor to Linux Kernel Module Cheat, but more wordy and less automated.
The fact that this foundation has a bunch of paid, closed, certification courses makes Ciro Santilli not respect them at all. They should be making open access content instead!
Pinned article: ourbigbook/introduction-to-the-ourbigbook-project
Welcome to the OurBigBook Project! Our goal is to create the perfect publishing platform for STEM subjects, and get university-level students to write the best free STEM tutorials ever.
Everyone is welcome to create an account and play with the site: ourbigbook.com/go/register. We belive that students themselves can write amazing tutorials, but teachers are welcome too. You can write about anything you want, it doesn't have to be STEM or even educational. Silly test content is very welcome and you won't be penalized in any way. Just keep it legal!
We have two killer features:
- topics: topics group articles by different users with the same title, e.g. here is the topic for the "Fundamental Theorem of Calculus" ourbigbook.com/go/topic/fundamental-theorem-of-calculusArticles of different users are sorted by upvote within each article page. This feature is a bit like:
- a Wikipedia where each user can have their own version of each article
- a Q&A website like Stack Overflow, where multiple people can give their views on a given topic, and the best ones are sorted by upvote. Except you don't need to wait for someone to ask first, and any topic goes, no matter how narrow or broad
This feature makes it possible for readers to find better explanations of any topic created by other writers. And it allows writers to create an explanation in a place that readers might actually find it.
Figure 1. Screenshot of the "Derivative" topic page. View it live at: ourbigbook.com/go/topic/derivative - local editing: you can store all your personal knowledge base content locally in a plaintext markup format that can be edited locally and published either:This way you can be sure that even if OurBigBook.com were to go down one day (which we have no plans to do as it is quite cheap to host!), your content will still be perfectly readable as a static site.
- to OurBigBook.com to get awesome multi-user features like topics and likes
- as HTML files to a static website, which you can host yourself for free on many external providers like GitHub Pages, and remain in full control
Figure 2. You can publish local OurBigBook lightweight markup files to either OurBigBook.com or as a static website.
Figure 3. Visual Studio Code extension installation.
Figure 4. Visual Studio Code extension tree navigation.
Figure 5. . You can also edit articles on the Web editor without installing anything locally. Video 3. Edit locally and publish demo. Source. This shows editing OurBigBook Markup and publishing it using the Visual Studio Code extension.Video 4. OurBigBook Visual Studio Code extension editing and navigation demo. Source. - Internal cross file references done right:
- Infinitely deep tables of contents:
Figure 6. Dynamic article tree with infinitely deep table of contents.Live URL: ourbigbook.com/cirosantilli/chordateDescendant pages can also show up as toplevel e.g.: ourbigbook.com/cirosantilli/chordate-subclade
All our software is open source and hosted at: github.com/ourbigbook/ourbigbook
Further documentation can be found at: docs.ourbigbook.com
Feel free to reach our to us for any help or suggestions: docs.ourbigbook.com/#contact