Jamie Tanna | Software Engineer

How to Undo a git push --force (5 mins read).

How to recover from a force push with Git.

Sat, 23 Oct 2021 10:26 by Jamie Tanna . #blogumentation #git.

If you run env GIT_SSH_COMMAND='ssh -vvv that'll give you the verbose output you'll need from ssh to do it 👍🏽

Mon, 18 Oct 2021 16:22 by Jamie Tanna . #git.

Post details

https://twitter.com/FiloSottile/status/1447899563298365441
Oh no why is one commit fixing two different things
Matthew Garrett (@mjg59)Tue, 12 Oct 2021 20:57 +0000

Tue, 12 Oct 2021 22:28 by Jamie Tanna . #git.

If you've already fetched the Git history from the remote you shouldn't need WiFi to rebase any more 🤞🏽

Wed, 29 Sep 2021 21:56 by Jamie Tanna . #git.

Pushing Back to Git In a Jenkins Multibranch Pipeline (1 mins read).

How to push back to a Git repo using a Jenkins multibranch pipeline.

Mon, 06 Sep 2021 10:00 by Jamie Tanna . #blogumentation #jenkins #git.

Bookmarked https://sethrobertson.github.io/GitBestPractices/ .

Sun, 04 Jul 2021 11:48 by Jamie Tanna . #git.

Post details

I had a go making a CLI for the first time to save myself always googling "how to do x with git". It's still suuuuuper buggy but ~mostly~ functional
katie walker (@KatCodes)Mon, 31 May 2021 19:48 +0000

Tue, 01 Jun 2021 07:35 by Jamie Tanna . #git.

Post details

Git != GitHub
Ayushi Rawat (@ayushi7rawat)Sat, 22 May 2021 22:19 +0000

Sun, 23 May 2021 22:10 by Jamie Tanna . #git #github.

https://www.jvt.me/posts/2021/03/31/git-origin-head/ may be of interest as a fairly well supported way of getting upstream default branch - I'm interested in this too though so I'll have a play with it tomorrow too

Thu, 13 May 2021 22:35 by Jamie Tanna . #git.

Liked https://www.reddit.com/r/archlinux/comments/lyazre/openssh_update_causes_problems/gpuwe3x/ .

Post details

https://twitter.com/ThisIsMissEm/status/1392896447977242625
Without this setting you can still just type "p". Since I use vim keybindings I often just block select "pick" and replace it with "s". This is just about the default it fills in for you.
Wes (@wesleytodd)Thu, 13 May 2021 17:47 +0000

Thu, 13 May 2021 19:34 by Jamie Tanna . #git.

Sun, 25 Apr 2021 21:37 by Jamie Tanna . #openssh #gitlab #git.

Liked https://github.com/gruntwork-io/git-xargs .

Thu, 22 Apr 2021 21:59 by Jamie Tanna . #github #git #automation.

Post details

MacOS devs: please add .DS_Store to your .gitignore_global please
shelby spees is staying home 😷 (@shelbyspees)Thu, 15 Apr 2021 15:53 +0000

Thu, 15 Apr 2021 17:40 by Jamie Tanna . #git #mac.

Hmm I'll have to try it but I thought rebase-merge was the same as a --no-ff merge

Wed, 07 Apr 2021 20:33 by Jamie Tanna . #git #github.

Liked https://github.com/michaeljones/on-commit-messages .

Tue, 06 Apr 2021 08:21 by Jamie Tanna . #git.

Bookmarked https://github.com/michaeljones/on-commit-messages .

Tue, 06 Apr 2021 08:20 by Jamie Tanna . #git.

Post details

ALWAYS WRITE MEANINGFUL COMMIT MESSAGES BECAUSE IF YOU DONT SQUASH I HAVE TO READ NONSENSE
Sailor Ghoul 👻✨ (@javavvitch)Fri, 02 Apr 2021 22:18 +0000

Fri, 02 Apr 2021 23:42 by Jamie Tanna . #git.

Working with a Git remote's default branch, using origin/HEAD (2 mins read).

How to interact with the default branch for a remote repo, as well as update it if needed.

Wed, 31 Mar 2021 19:15 by Jamie Tanna . #blogumentation #git.

Liked https://rory.bio/posts/git-plan/ .

Wed, 31 Mar 2021 18:26 by Jamie Tanna . #git.

Liked https://abildskov.io/2021/03/28/why-i-hate-submodules/ .

Wed, 31 Mar 2021 18:04 by Jamie Tanna . #git.

Post details

Open source friends: what are the best pieces of "Git/GitHub etiquette" you've picked up over the years? Things like submitting large changes commit-by-commit to help reviewers out.
Celeste Horgan (@celeste_horgan)Thu, 25 Mar 2021 21:06 GMT

Sat, 27 Mar 2021 14:49 by Jamie Tanna . #open-source #git #github #code-review #gitlab.

Have you looked at git reflog? It shows a log of all operations on your local repo and allows you to do exactly that - find commit hashes to go back to, which you could then git reset --hard

Sun, 21 Mar 2021 19:26 by Jamie Tanna . #git.

Determining the (Git) Branch of the Jenkins Pipeline Job (1 mins read).

How to find out what branch the currently executing script has been checked out from.

Thu, 04 Mar 2021 09:01 by Jamie Tanna . #blogumentation #jenkins #git.

Bookmarked https://daniel.haxx.se/blog/2021/01/28/what-if-github-is-the-devil/ .

Sun, 31 Jan 2021 14:28 by Jamie Tanna . #git #github #ethics #open-source.

Bookmarked https://www.netlify.com/blog/2020/03/31/how-to-scope-down-prs/ .

A good read - I've found that too many PRs then ends up difficult as you're constantly rebasing them to remove the constant merge commits, so am happy with a larger PR with lots of atomic commits that allow reviewing them in isolation

Fri, 29 Jan 2021 08:13 by Jamie Tanna . #git #code-review.

Bookmarked https://about.gitlab.com/blog/2020/11/23/keep-git-history-clean-with-interactive-rebase/ .

Mon, 11 Jan 2021 10:24 by Jamie Tanna . #git.

Post details

Help! My (27M) commits (abef8c, 94a6cb, 39d30c, 51afee, 34c392) have unionized with a squash and rebase.
i can fix my mistakes don't give me solutions (@mgattozzi)Sat, 02 Jan 2021 23:32 GMT

Sun, 03 Jan 2021 13:07 by Jamie Tanna . #git.

Liked https://blog.brixit.nl/git-email-flow-versus-github-flow/ .

Sun, 03 Jan 2021 12:10 by Jamie Tanna . #git #github #gitlab.

Bookmarked https://nibblestew.blogspot.com/2020/12/some-things-potential-git-replacement.html?m=1&s=09 .

Sat, 02 Jan 2021 16:27 by Jamie Tanna . #git.

Post details

If you ever see a blog post that claims Git makes perfect sense once you learn <FACT>, the author is lying.
Russ Cox (@_rsc)Tue, 22 Dec 2020 22:29 GMT

Wed, 23 Dec 2020 09:50 by Jamie Tanna . #git.

Liked https://jemma.dev/blog/git-stash .

Sat, 05 Dec 2020 11:18 by Jamie Tanna . #git.

A number of Git hosting tools (GitLab and GitHub at least) use origin/HEAD to denote primary branch on the upstream so you could probably do something with that

Thu, 03 Dec 2020 20:22 by Jamie Tanna . #git.

Bookmarked https://tekin.co.uk/2020/11/patterns-for-searching-git-revision-histories .

Sun, 22 Nov 2020 13:02 by Jamie Tanna . #git.

Liked http://joeyh.name/blog/entry/how_to_publish_git_repos_that_cannot_be_republished_to_github/ .

Bookmarked https://blog.danlew.net/2020/11/11/trello-androids-git-branching-strategy/ .

I think the general rule of thumb is "try not to support anything other than the latest version in Production and the latest development version, and even then reduce the time that there are two versions as much as possible" but with things like user-managed software, or where your path to production is slower, it can be difficult to say that.

Fri, 13 Nov 2020 08:47 by Jamie Tanna . #git.

Wed, 04 Nov 2020 13:53 by Jamie Tanna . #git #github.

Using Git Diff Without a Repo (1 mins read).

How to use git diff when you're not in a Git repo.

Thu, 29 Oct 2020 09:24 by Jamie Tanna . #blogumentation #git.

Post details

I don't know who needs to hear this but... Delete that branch after merging.
Jenn Creighton (@gurlcode)Wed, 07 Oct 2020 17:42 +0000

Thu, 08 Oct 2020 23:01 by Jamie Tanna . #git.

unknown revision or path not in the working tree after Jenkins Git Plugin Update (1 mins read).

How to fix git rev-parse suddenly not working after a Jenkins Git plugin update.

Wed, 07 Oct 2020 22:09 by Jamie Tanna . #blogumentation #jenkins #git.

Bookmarked https://blog.ploeh.dk/2020/10/05/fortunately-i-dont-squash-my-commits/ .

Tue, 06 Oct 2020 18:14 by Jamie Tanna . #git.

Debugging Git Errors Using Environment Variables (1 mins read).

How to use environment variables such as GIT_TRACE to debug what's going wrong / what's happening under the hood with git.

Tue, 22 Sep 2020 13:48 by Jamie Tanna . #blogumentation #git.

I don't think so but https://github.com/forgefed/forgefed is a standard that's being worked on to make it possible to federated across providers for this reason

Sun, 13 Sep 2020 20:31 by Jamie Tanna . #git.

Bookmarked https://akrabat.com/ignoring-revisions-with-git-blame/ .

Sat, 22 Aug 2020 09:55 by Jamie Tanna . #git.

Post details

Okay I'm sorry but this question mark is super passive-aggressive and I don't like it
Emma Bostian 🐞 (@EmmaBostian)Wed, 12 Aug 2020 13:56 +0000

Wed, 12 Aug 2020 20:31 by Jamie Tanna . #git.

Bookmarked https://jeremykun.com/2020/01/14/the-communicative-value-of-using-git-well/ .

Sun, 19 Jul 2020 10:39 by Jamie Tanna . #git.

Post details

protip: Git is advertised as a "collaboration" tool, but advanced devs know its actually a blame tool. To use git properly, learn these phrases: "It'll be done if Amy ever approves it" "I didn't expose that API key, Steve did" "Well, it's been broken since Tom merged his change"
Kat Maddox (@ctrlshifti)Thu, 09 Jul 2020 02:05 +0000

Thu, 09 Jul 2020 10:46 by Jamie Tanna . #git.