2024 on The Total Token Vortex

2024 on The Total Token Vortexhttps://total-token-vortex.vercel.app/posts/2024/Recent content in 2024 on The Total Token VortexHugo -- gohugo.ioen© 2026 Maciej KalisiakTue, 20 Aug 2024 17:09:00 +0000Getting the pretty 'tree' for 'git log'https://total-token-vortex.vercel.app/posts/2024/getting-the-pretty-tree-for-git-log/Tue, 20 Aug 2024 17:09:00 +0000https://total-token-vortex.vercel.app/posts/2024/getting-the-pretty-tree-for-git-log/<p>See: <a href="https://stackoverflow.com/questions/1057564/pretty-git-branch-graphs" target="_blank" rel="noreferrer">https://stackoverflow.com/questions/1057564/pretty-git-branch-graphs</a></p> <p>In short, can use this one-liner:</p> <blockquote><p>git log –all –decorate –oneline –graph</p> </blockquote><p>You can also make this into its own ‘git’ command (‘git adog’) using:</p> <blockquote><p> git config –global alias.adog “log –all –decorate –oneline –graph”</p>The many merge options for 'git pull'https://total-token-vortex.vercel.app/posts/2024/the-many-merge-options-for-git-pull/Tue, 20 Aug 2024 17:03:00 +0000https://total-token-vortex.vercel.app/posts/2024/the-many-merge-options-for-git-pull/<p>Ran into this (massive hint printout from git when attempting pull)</p> <blockquote><div class="highlight-wrapper"><div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-text-size-adjust:none;"><code class="language-text" data-lang="text"><span style="display:flex;"><span>Hint: You have divergent branches and need to specify how to reconcile them. </span></span><span style="display:flex;"><span>Hint: You can do so by running one of the following commands sometime before </span></span><span style="display:flex;"><span>Hint: your next pull: </span></span><span style="display:flex;"><span>Hint: </span></span><span style="display:flex;"><span>Hint: git config pull.rebase false # merge </span></span><span style="display:flex;"><span>Hint: git config pull.rebase true # rebase </span></span><span style="display:flex;"><span>Hint: git config pull.ff only # fast-forward only </span></span><span style="display:flex;"><span>Hint: </span></span><span style="display:flex;"><span>Hint: You can replace "git config" with "git config --global" to set a default </span></span><span style="display:flex;"><span>Hint: preference for all repositories. You can also pass --rebase, --no-rebase, </span></span><span style="display:flex;"><span>Hint: or --ff-only on the command line to override the configured default per </span></span><span style="display:flex;"><span>Hint: invocation. </span></span><span style="display:flex;"><span>Git failed with a fatal error. </span></span><span style="display:flex;"><span>Git failed with a fatal error. </span></span><span style="display:flex;"><span>Need to specify how to reconcile divergent branches.</span></span></code></pre></div></div> </blockquote><p>And then thankfully came across this <a href="https://stackoverflow.com/questions/71768999/how-to-merge-when-you-get-error-hint-you-have-divergent-branches-and-need-to-s" target="_blank" rel="noreferrer">VERY informative StackOverflow post</a>:</p>Interesting posts on ZSA bloghttps://total-token-vortex.vercel.app/posts/2024/interesting-posts-on-zsa-blog/Tue, 13 Aug 2024 18:28:00 +0000https://total-token-vortex.vercel.app/posts/2024/interesting-posts-on-zsa-blog/<ul> <li><a href="https://blog.zsa.io/alternate-english-layouts/" target="_blank" rel="noreferrer">Setting Up Alternate English Layouts</a></li> <li><a href="https://blog.zsa.io/keys-not-matching-output/" target="_blank" rel="noreferrer">Why Keys Don’t Do What You Expect</a></li> <li><a href="https://blog.zsa.io/voyager-shifted-layout/" target="_blank" rel="noreferrer">Shifted Voyager Layout</a></li> <li><a href="https://blog.zsa.io/zsa-loves-colemak/" target="_blank" rel="noreferrer">ZSA Loves: Colemak</a></li> </ul>Interesting read: Mediocre Engineer’s guide to HTTPShttps://total-token-vortex.vercel.app/posts/2024/interesting-read-mediocre-engineer-s-guide-to-https/Tue, 13 Aug 2024 18:22:00 +0000https://total-token-vortex.vercel.app/posts/2024/interesting-read-mediocre-engineer-s-guide-to-https/<p><a href="https://devonperoutky.super.site/blog-posts/mediocre-engineers-guide-to-https" target="_blank" rel="noreferrer">https://devonperoutky.super.site/blog-posts/mediocre-engineers-guide-to-https</a></p>Interesting read: principles for keyboard layoutshttps://total-token-vortex.vercel.app/posts/2024/interesting-read-principles-for-keyboard-layouts/Tue, 13 Aug 2024 18:22:00 +0000https://total-token-vortex.vercel.app/posts/2024/interesting-read-principles-for-keyboard-layouts/<p><a href="https://anniecherkaev.com/principles-for-keyboard-layouts" target="_blank" rel="noreferrer">https://anniecherkaev.com/principles-for-keyboard-layouts</a></p>Potential purchase: hand-held scopehttps://total-token-vortex.vercel.app/posts/2024/potential-purchase-hand-held-scope/Tue, 13 Aug 2024 18:21:00 +0000https://total-token-vortex.vercel.app/posts/2024/potential-purchase-hand-held-scope/<p><a href="https://zoyitools.com/product/zt-703s/" target="_blank" rel="noreferrer">https://zoyitools.com/product/zt-703s/</a></p>Interesting HN post: The Engineer’s Guide to Deep Learning: Understanding the Transformer Modelhttps://total-token-vortex.vercel.app/posts/2024/interesting-hn-post-the-engineer-s-guide-to-deep-learning-understanding-the-transformer-model/Tue, 13 Aug 2024 18:20:00 +0000https://total-token-vortex.vercel.app/posts/2024/interesting-hn-post-the-engineer-s-guide-to-deep-learning-understanding-the-transformer-model/<p><a href="https://news.ycombinator.com/item?id=40974193" target="_blank" rel="noreferrer">https://news.ycombinator.com/item?id=40974193</a></p>Dyson hand vacuum battery troubleshttps://total-token-vortex.vercel.app/posts/2024/dyson-hand-vacuum-battery-troubles/Tue, 13 Aug 2024 18:19:00 +0000https://total-token-vortex.vercel.app/posts/2024/dyson-hand-vacuum-battery-troubles/<p>Relevant articles, maybe:</p> <ul> <li><a href="https://www.dyson.com/support/vacuum-cleaners/cordless/battery-care" target="_blank" rel="noreferrer">https://www.dyson.com/support/vacuum-cleaners/cordless/battery-care</a></li> <li><a href="https://www.bestbuy.com/site/questions/dyson-v7-motorhead-cord-free-stick-vacuum-fuschia/5712664/question/5044ca65-ef4f-355a-99d9-83aa51fb2598" target="_blank" rel="noreferrer">https://www.bestbuy.com/site/questions/dyson-v7-motorhead-cord-free-stick-vacuum-fuschia/5712664/question/5044ca65-ef4f-355a-99d9-83aa51fb2598</a></li> </ul>Fun Reddit post: Games you get extremely OP in without any glitch/hacks?https://total-token-vortex.vercel.app/posts/2024/fun-reddit-post-games-you-get-extremely-op-in-without-any-glitch-hacks/Tue, 13 Aug 2024 18:17:00 +0000https://total-token-vortex.vercel.app/posts/2024/fun-reddit-post-games-you-get-extremely-op-in-without-any-glitch-hacks/<p><a href="https://old.reddit.com/r/gaming/comments/1emkf7f/games" target="_blank" rel="noreferrer">https://old.reddit.com/r/gaming/comments/1emkf7f/games</a>_you_get_extremely_op_in_without_any/</p>Kruggsmash playing CoQhttps://total-token-vortex.vercel.app/posts/2024/kruggsmash-playing-coq/Tue, 13 Aug 2024 18:17:00 +0000https://total-token-vortex.vercel.app/posts/2024/kruggsmash-playing-coq/<p>Kruggsmash, of “Dwarf Fortress YT videos” fame, started playing Caves of Qud!</p> <p><a href="https://www.youtube.com/watch?v=UcJSfynSTq0" target="_blank" rel="noreferrer">https://www.youtube.com/watch?v=UcJSfynSTq0</a></p>TIL abotu Anna's Archivehttps://total-token-vortex.vercel.app/posts/2024/til-about-anna-s-archive/Tue, 13 Aug 2024 18:16:00 +0000https://total-token-vortex.vercel.app/posts/2024/til-about-anna-s-archive/<p><a href="https://en.wikipedia.org/wiki/Anna%27s" target="_blank" rel="noreferrer">https://en.wikipedia.org/wiki/Anna%27s</a>_Archive</p> <hr> <blockquote><p><strong>Claude (migration note):</strong> <em>Filename renamed from <code>til-abotu-anna-s-archive</code> to <code>til-about-anna-s-archive</code> (typo/encoding fix).</em></p> </blockquote>Interesting article: State of Text Rendering 2024https://total-token-vortex.vercel.app/posts/2024/interesting-article-state-of-text-rendering-2024/Tue, 13 Aug 2024 18:15:00 +0000https://total-token-vortex.vercel.app/posts/2024/interesting-article-state-of-text-rendering-2024/<p><a href="https://behdad.org/text2024/" target="_blank" rel="noreferrer">https://behdad.org/text2024/</a></p>Interesting read: Entering text in the terminal is complicatedhttps://total-token-vortex.vercel.app/posts/2024/interesting-read-entering-text-in-the-terminal-is-complicated/Tue, 13 Aug 2024 18:15:00 +0000https://total-token-vortex.vercel.app/posts/2024/interesting-read-entering-text-in-the-terminal-is-complicated/<p><a href="https://jvns.ca/blog/2024/07/08/readline/" target="_blank" rel="noreferrer">https://jvns.ca/blog/2024/07/08/readline/</a></p>Interesting HN article: How to think in writinghttps://total-token-vortex.vercel.app/posts/2024/interesting-hn-article-how-to-think-in-writing/Tue, 13 Aug 2024 18:14:00 +0000https://total-token-vortex.vercel.app/posts/2024/interesting-hn-article-how-to-think-in-writing/<p><a href="https://news.ycombinator.com/item?id=40892298" target="_blank" rel="noreferrer">https://news.ycombinator.com/item?id=40892298</a></p>Interesting read: Doing is normally distributed, learning is log-normalhttps://total-token-vortex.vercel.app/posts/2024/interesting-read-doing-is-normally-distributed-learning-is-log-normal/Tue, 13 Aug 2024 18:13:00 +0000https://total-token-vortex.vercel.app/posts/2024/interesting-read-doing-is-normally-distributed-learning-is-log-normal/<p><a href="https://hiandrewquinn.github.io/til-site/posts/doing-is-normally-distributed-learning-is-log-normal/" target="_blank" rel="noreferrer">https://hiandrewquinn.github.io/til-site/posts/doing-is-normally-distributed-learning-is-log-normal/</a></p>