There you are, minding your own business, rebasing your branch and… surprise! A merge conflict!| adamj.eu
Have you ever accidentally committed a bunch of junk created by your OS, like Thumbs.db files from Windows, or .DS_Store files from macOS? Or, have you joined a project, and for one of your first commits, added rules to the .gitignore file for your text editor’s project files? If so, this post is for you! You can avoid such pain or busywork by making a global ignore file.| adamj.eu
Git: find the largest commits| adamj.eu
🚀 Updated April 4th 2024. See the update post.This book covers the best command line Git tools, techniques, tips, tricks, and tactical tidbits I’ve encountered from 11.5 years of using Git. The selection reflects my preferences for well-maintained tools that provide high value with little need for customization.Note that this book is not an introduction to Git and assumes that you’re already using Git on a daily basis. It offers ways to improve your developer experience with Git that u...| Gumroad
3.53K Posts, 424 Following, 1.7K Followers · :django: #Django blogger and contributor ✍️ Author of three books on Django and Git 🍕 Django London co-organizer 🇬🇧 London / 🇵🇹 Lisbon| Fosstodon
-s --short | git-scm.com
--replace-all | git-scm.com