git Archives - Page 2 of 2 - Embedded Artistry

15 March 201814 December 2021

Safely Storing Secrets in Git

I've worked on many projects where sensitive information is stored in a git repository. This includes SSH keys, SSL private keys, API keys, passwords, and client secrets. This practice is easily labelled Not Good. You might be thinking, "Why should I worry? Our GitHub repository is private, and only our team can access the secrets!" …

Continue reading "Safely Storing Secrets in Git"

19 February 201821 April 2020

Code Cleanup: Splitting Up git Commits In the Middle of a Branch

I tend to follow a fairly traditional git development flow. When I am working on a new feature or a bug fix, I will make a branch and commit changes as I progress. I often just quickly commit incremental changes and make brief notes on my logic for that chunk. I like to clean up …

Continue reading "Code Cleanup: Splitting Up git Commits In the Middle of a Branch"

18 August 201715 December 2021

A GitHub Issue Template for Your Projects

Now that we have some example pull request templates, we might as well create an issue template for our GitHub projects. Table of Contents: Creating an Issue Template for Your Project My Template Example Template File Further Reading Creating an Issue Template for Your Project Similarly to a PR template, it's super easy to setup …

Continue reading "A GitHub Issue Template for Your Projects"

11 August 201716 August 2024

A Github Pull Request Template for the CCC Process

Previously I shared a Code Change Control commit template. The CCC commit template provides much more rigor and documentation than a normal commit message. When you need stability and strict testing, such as when attempting to stabilize for a customer release, the CCC process helps ensure that we include changes that are thoroughly tested and justified. An alternative …

Continue reading "A Github Pull Request Template for the CCC Process"

4 August 201715 December 2021

A GitHub Pull Request Template for Your Projects

I've been thinking about creating GitHub issue and pull request templates for my own projects. These templates auto-populate the issue/pull-request description field and provide a skeleton framework that you can fill out. I like these templates every time I come across them, since they help provide a baseline standard of informational quality and organizational rigor. …

Continue reading "A GitHub Pull Request Template for Your Projects"

10 November 20161 December 2023

git: Finding Tags Associated With a Commit

If your source tree is complicated and multiple branches are in use, it can often be difficult to quickly determine which tagged builds contain a specific commit. Did this fix go to the beta branch? Did it make it into 0.9.54, or was it 0.9.55? Here's the git command you need: git tag --contains a5b49f9 …

Continue reading "git: Finding Tags Associated With a Commit"

2 November 20161 December 2023

git: Comparing Multiple Branches

Wanting to compare multiple branches in git? Give this a shot: git log --color --graph --topo-order --oneline origin/master origin/branch1 origin/branch2

Continue readinggit: Comparing Multiple Branches

28 October 20168 May 2023

git aliases: svn revert

People converting from svn to git often have a hard time finding an analogous process for their svn commands. For something similar to svn revert, you need to do the following: git clean -df git checkout -- . The first command will remove newly created files that have not yet been staged for commit. The second …

Continue reading "git aliases: svn revert"

19 October 20161 December 2023

git cherry-pick recommendations

If you’re planning to cherry-pick commits between branches, I recommend that you always use the -xflag when cherry picking: ""Quote -x When recording the commit, append a line that says “(cherry picked from commit …)”to the original commit message in order to indicate which commit this change was cherry-picked from. This is done only for cherry …

Continue reading "git cherry-pick recommendations"