Regular Dev

Git Quickie: Branch Comparison

Dmytro Holysh — Thu, 06 Apr 2023 11:56:39 GMT

If you want to check what has been changed, you usually use git diff one-branch another , right?

But the problem is that it produces a lot of output that in some cases is not needed.

So there is a nice shortcut in case you want to compare two branches quickly without caring about commits. The --name-only param will list the file names that are different:

git diff --name-only dev main

How often do you check diff? What are the most common use cases for it? I did this only once or twice in console but it was fun :)

Git Quickie: Skip Tracking

Dmytro Holysh — Mon, 03 Apr 2023 11:10:39 GMT

Many credentials are accidentally committed to different git repositories (GitHub, GitLab, etc.), which reduces app security as anyone can scan public repo for some common files/variables with credentials.

To avoid this, we usually use .gitignore but sometimes there could be corner cases. For example, we've got the .npmrc file with the predefined field for using of token to access private registries. And file with that placeholder is committed to source control.

So what can we do to not commit private tokens accidentally? There is another one-line command for this:

git update-index --skip-worktree .npmrc

What are your favorite git commands? Please, don't hesitate to share them in the comments section!

Git Quickie: Changelog

Dmytro Holysh — Sun, 02 Apr 2023 18:17:20 GMT

Sometimes there is a need to see what has been done since a specific commit but a bit hard to navigate through the repo history. In case there is no changelog generation tool configured, we can use git to generate a simple changelog (possible formats docs here):

git log 93f832d9..HEAD --pretty=format:'%h : %B' > CHANGELOG.md

...and here you are!

Here is example of generated log from my old repo:

c55a257 : updated naming

0702aa1 : Merge pull request #5 from iuriidanylevych/feature/results-google-spreadsheet

added code length counter, results are saved in google spreadsheet
3f52461 : added code length counter, results are saved in google spreadsheet

7a70d71 : Merge pull request #4 from iuriidanylevych/feature/updated-cocktail-map

updated cocktail map
f150180 : updated cocktail map

5110851 : Merge pull request #3 from iuriidanylevych/feature/moved-out-constants

Feature/moved out constants
1cdc12f : updated readme

79baf6b : moved out constants, ran prettier

097a901 : Merge pull request #2 from iuriidanylevych/feat/add-hard-mode

feat: add possibility to set difficulty
d934aba : fix: move info about tips from normal mode to hard mode

1d381c6 : chore: set normal mode by default in case user somehow didn't select it

1db5256 : feat: add possibility to set difficulty

d034e4e : Merge pull request #1 from iuriidanylevych/description-update

update description, use Set instead of Array, Map instead of Object
45eff4e : update description, use Set instead of Array, Map instead of Object

7190689 : added basic functionality