Good-lookin' diffs. Actually… nah… The best-lookin' diffs. :tada: - so-fancy

Reading Time: 5 minutes Git’s push --force is destructive because it unconditionally overwrites the remote repository with whatever you have locally, possibly overwriting any changes that…

Additional Information on Undoing things in git: https://git-scm.com/book/en/v2/Git-Basics-Undoing-Things

Commit history (preferably of a non-pushed path, since it rewrites hashes) can be edited; useful for feature branches with useless commits / debug messages / strange orders and so on -- things which happen during committing, but should not stay in the end-product.

• best article: https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
• why squash?: https://jamescooke.info/git-to-squash-or-not-to-squash.html
• rebasing basics: https://git-scm.com/book/en/v2/Git-Branching-Rebasing
• some workflow recommendations: http://justinhileman.info/article/changing-history/
• additional tips (mostly covered in first link tho): https://www.maykinmedia.nl/blog/2017/nov/20/git-rebasing-make-your-commit-history-pretty/

incredible git aliases

excerpts:

• find branches by grepping for parts of their name in your codebase
• get summaries of your own commits and logs since a specific last point in time
• quickly host your own git server to push to, pull from (through gits built in server)
• directly running ci tests/documentation generation/deployments from the commandline through git by using json-parsing and a rest-api

[26:00]

How to avoid merge conflicts in a NEWS or ChangeLog file

An introductory guide and resource for Git hooks. Learn how to use pre-commit hooks, post-commit hooks, post-receive hooks, and more. Created by Matthew Hudson, a programmer experimenting with combing Git + WebHooks + Webpipes.

I have been using LaTeX for a couple of years now, but not until yesterday I combined it with git after reading about this possibility. Here are...

Git with a cup of tea, painless self-hosted git service - go-gitea

(fork of gogs with more advancements)

Style guides and reasons for commit messages

Create 'powerpoint' presentations directly from a markdown file in git-(lab/hub/gitea/gogs)

see what

git config --get remote.origin.fetch 

produces

If it's not +refs/heads/:refs/remotes/origin/, do

git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"

Check whether .git/config contains

[remote "origin"]
url = …
fetch = +refs/heads/master:refs/remotes/origin/master
If so, change it to say

[remote "origin"]
url = …
fetch = +refs/heads/:refs/remotes/origin/
Then you should be able to use it:

Also <(...) is a bash feature and won't work in alpine as it has a sh shell. Use echo "$GITLAB_DEPLOY_KEY" | ssh-add - instead – Lightheaded Sep 7 at 9:11