Jamie Tanna | Software Engineer

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/ .

Recommended read: What if GitHub is the devil? 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

Recommended read: How to Scope Down PRs https://www.netlify.com/blog/2020/03/31/how-to-scope-down-prs/

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/ .

Recommended read: How to keep your Git history clean with interactive rebase 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 .

Recommended read: Some things a potential Git replacement probably needs to provide 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 .

Recommended read: Why Git blame sucks for understanding WTF code (and what to use instead) 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.

Recommended read: Trello Android's Git Branching Strategy https://blog.danlew.net/2020/11/11/trello-androids-git-branching-strategy/

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/ .

Recommended read: Fortunately, I don't squash my commits 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/ .

Recommended read: Ignoring mass reformatting commits with git blame – Rob Allen's DevNotes 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/ .

Recommended read: The Communicative Value of Using Git Well – Math ∩ Programming 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.

Post details

https://twitter.com/hmemcpy/status/1277194673577234432
Check in a `.gitattributes`. Ignore `core.autocrlf`. edwardthomson.com/blog/git_for_w…
Edward Thomson (@ethomson)Sun, 28 Jun 2020 11:11 +0000

Sun, 28 Jun 2020 13:06 by Jamie Tanna . #git.

Liked https://github.com/tummychow/git-absorb .

Tue, 16 Jun 2020 10:52 by Jamie Tanna . #git.

Bookmarked https://stackoverflow.com/questions/33610682/git-list-of-staged-files/33610683#33610683 .

Recommended read: git diff - Git list of staged files - Stack Overflow https://stackoverflow.com/questions/33610682/git-list-of-staged-files/33610683#33610683

Fri, 29 May 2020 09:27 by Jamie Tanna . #git.

Bookmarked https://www.moxio.com/blog/43/ignoring-bulk-change-commits-with-git-blame .

Recommended read: Ignoring bulk change commits with git blame https://www.moxio.com/blog/43/ignoring-bulk-change-commits-with-git-blame

Mon, 23 Mar 2020 22:56 by Jamie Tanna . #command-line #git.

Bookmarked https://lwn.net/SubscriberLink/811068/cfeb6a67b8dfbe47/ .

Recommended read: A new hash algorithm for Git https://lwn.net/SubscriberLink/811068/cfeb6a67b8dfbe47/

Wed, 05 Feb 2020 10:30 by Jamie Tanna . #git.

Backporting/Replaying Changes using git format-patch and git apply / git-am (2 mins read).

Using git format-patch and git apply/git am to apply a patch, if git cherry-pick isn't available.

Tue, 17 Dec 2019 21:33 by Jamie Tanna . #blogumentation #git.

List What Files Changed in a Git Commit (1 mins read).

How to list what files changed in a given commit.

Sun, 15 Dec 2019 22:28 by Jamie Tanna . #blogumentation #git #command-line.

From me it's a no - I see why some people want it, but would rather prefer they stay out of the already limited space in the commit message title, and there's a level of arguable subjectivity of what an emoji means especially as different teams, projects and cultures have views on it.

But then again, so does written language, but I feel that is at least more known?

Wed, 11 Dec 2019 19:56 by Jamie Tanna . #git.

Bookmarked https://vincent.bernat.ch/en/blog/2019-zsh-async-vcs-info .

This is an interesting idea - I've not been bitten by it before, but may be worth adding to my dotfiles anyway

Recommended read: Zsh prompt with asynchronous Git status https://vincent.bernat.ch/en/blog/2019-zsh-async-vcs-info

Sat, 07 Dec 2019 00:57 by Jamie Tanna . #zsh #git #dotfiles.

Bookmarked https://julien.danjou.info/properly-managing-your-gitignore/ .

Recommended read: Properly managing your `.gitignore` file https://julien.danjou.info/properly-managing-your-gitignore/

Wed, 04 Dec 2019 23:45 by Jamie Tanna . #git.

Only Adding Changes for Tracked Files With Git (1 mins read).

How to only add files that have changed with git add -u.

Thu, 21 Nov 2019 22:30 by Jamie Tanna . #blogumentation #nablopomo #git.

Bookmarked https://ma.ttias.be/specify-a-specific-ssh-private-key-for-git-pull-git-clone/ .

Recommended read: Specify a specific SSH private key for git pull/git clone https://ma.ttias.be/specify-a-specific-ssh-private-key-for-git-pull-git-clone/

Tue, 19 Nov 2019 19:39 by Jamie Tanna . #ssh #git.

Creating a Global .gitignore (1 mins read).

How to have Git have a list of files to globally ignore, without configuring anything in your ~/.gitconfig.

Fri, 15 Nov 2019 00:31 by Jamie Tanna . #blogumentation #git #nablopomo.

Bookmarked https://fatbusinessman.com/2019/my-favourite-git-commit .

Recommended read: My favourite Git commit https://fatbusinessman.com/2019/my-favourite-git-commit

Sun, 20 Oct 2019 14:45 by Jamie Tanna . #git.

DevOpsDays London 2019 (63 mins read).

A writeup of the DevOpsDays London conference, and the talks and Open Spaces I attended.

Sat, 12 Oct 2019 12:56 by Jamie Tanna . #devopsdays #devops #cloud #events #monolith #microservices #testing #security #git #sre #on-call #legacy-code #agile #ethics #aws #empathy.

Getting git diff Outputs Without a Prefix (1 mins read).

How to remove a/ and b/ from git diff outputs.

Fri, 11 Oct 2019 19:39 by Jamie Tanna . #blogumentation #git.

Pushing your Git Branches to a Matching Remote Branch (1 mins read).

How to save yourself from typing git push --set-upstream origin ${branch} and have Git determine the branch you're pushing to.

Sun, 22 Sep 2019 15:33 by Jamie Tanna . #blogumentation #git.

Adding Newlines to all Files in Git (3 mins read).

Adding newlines at the end of all Git-tracked files.

Mon, 02 Sep 2019 22:35 by Jamie Tanna . #git #shell #command-line #blogumentation.

Bookmarked https://github.blog/2019-08-16-highlights-from-git-2-23/ .

GitHub always have a great recap of the new Git releases, and this is another - I'm particularly interested in some of the changes around git checkout

Recommended read: Highlights from Git 2.23 https://github.blog/2019-08-16-highlights-from-git-2-23/

Sat, 17 Aug 2019 22:39 by Jamie Tanna . #git.

Bookmarked https://blog.kennard.dev/2019-06-19-git-debug-gitignore/ .

I've not had to debug that many .gitignore files in the past, but it's great to know how I would do it in the future

Recommended read: Debugging the .gitignore file - Kennard https://blog.kennard.dev/2019-06-19-git-debug-gitignore/

Sun, 30 Jun 2019 21:30 by Jamie Tanna . #git.

Easily rewriting Git URLs from HTTPS to SSH and vice versa (2 mins read).

How to use Git's config to rewrite HTTPS URLs to SSH and vice versa, for repo pushes and pulls.

Wed, 20 Mar 2019 10:39 by Jamie Tanna . #blogumentation #git.

Using git worktree to have multiple branches checked out at once (4 mins read).

How to use git worktree to check out multiple Git branches from the same repo at once.

Tue, 29 Jan 2019 21:39 by Jamie Tanna . #blogumentation #git #git-worktree.

Using Git refs to help track your GitLab Environments, from your local repo (2 mins read).

How to pull the Git refs that GitLab Environments exposes in your GitLab repo.

Sat, 19 Jan 2019 18:06 by Jamie Tanna . #blogumentation #git #gitlab #review-apps #git-ref.

Using Git refs to check out GitHub Pull Requests, from your local repo (2 mins read).

How to pull the Git refs for Pull Requests to your GitHub repo.

Sat, 19 Jan 2019 17:18 by Jamie Tanna . #blogumentation #git #github #git-ref.