Git on Dark Kernel

Easy dotfiles management

Fri, 08 Nov 2024 00:00:00 +0000

The easiest way to version control your dotfiles.

Initialize empty repo at home

git init --bare $HOME/.dotfiles

[–more–] 2. Use working directory of git as $HOME, and git dir as .dotfiles

alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'

Only for current local repo, because it’s annoying.

config config status.showUntrackedFiles no

Here you go, check status, add your configs, and commit.

config status
config add .config/mpv
config commit -m "Added mpv config"

Create repo at github/gitlab and add origin -> Push.

config remote add origin <link>
config push origin master

Here you can use different branches for different computers, you can replicate you configuration easily on new installation -

For using dotfiles on other device

Clone repo into home, if its empty

git clone --separate-git-dir=~/.myconf <link-to-repo> ~

Or clone into separate tmp dir, otherwise it will fail if your home directory isn’t empty. Then copy your configs and remove tmp dir.

git clone --separate-git-dir=$HOME/.dotfiles <link-to-repo> $HOME/dotfiles-tmp
cp ~/dotfiles-tmp/.vimrc ~
rm -r ~/myconf-tmp/

Again set alias to manage dotfiles.

alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'

Done! easy peezy lemon squeezy :)

Reference: ArchWiki | Ycombinator

Add new change in previous commit

Mon, 29 Jul 2024 00:00:00 +0000

Find the commit hash you want to edit

git log

[–more–]

Start interactive rebase, adjust the number if needed git rebase -i HEAD~1
In the editor, change ‘pick’ to ’edit’ for the commit you want to modify
Save and close the editor
Add the new file

git add path/to/newfile

Amend the commit to include the new file git commit --amend

Save and close the commit message editor

Continue the rebase git rebase --continue
Resolve any conflicts if necessary Force push to the remote repository if needed git push --force

Git concepts

Sun, 13 Aug 2023 00:00:00 +0000

Git

Branching strategies
Vcs reset / revert
PR merge / branch merge
Merge vs rebase
Cherry pick
git stash

Never commit directly in master branch.

Important branches:

master: The main stable branch.
staging: For QA team, can be sent for production. Most of the time it is same as master.
develop: From where developers get codes.
feature: To add any feature.
- If passed => develop ↓
- If passed => staging ↓
- If passed => master.

Branching Strategies:

Small team strategy

Use all important branches
Create features from develop/dev branch.
- develop ↴
  
  → feature1
  
  → feature2
  
  → feature3 …
Use hot fixes whenever needed, like for small bugs, can be done by team lead.

hotfix: Fixing small bugs, like correction of spelling, no devs needed directly team lead can change it.

Big team strategy

There is change in branch name conventions like:
- master -> prd
- staging -> stg
- develop -> dev
Use JIRA like software, to manage projects. Tasks are assigned as tickets and then status is changed according to progress.
Integrate JIRA with github

Jira is Issue & project tracking system, which is used by many large scale companies.

Git Revert & Reset

git revert:

Used to revert/undo a particular commit, It creates new commit of revert, and keeps original commit history.

Example:
- Get commit id
```
git log --oneline
```
- Revert
```
git revert <commit-id>
```

Git Reset:

It is used to undo to a particular commit but, it removes all commits history after that commit. Mostly used in case like commited security credentials and want to remove it completely from commit history.

Example:
- If we have following log:
```
❯ git log --oneline
9210da8 (HEAD -> dev) added git ignore
e803737 no keys now
de7aa15 Revert "added line 2"
99c25e5 added line 2
25d7961 (master) initial commit
```
- We want to reset de7aa15, so we will have to use commitid of previous/below commit.
```
git reset 99c25e5
```
- So after 99c25e5 all commits will be deleted.

Don’t use git add ., some times it might track files which is confidential and can lead to risk.

Git Merge

Branch Merge:

Git merge is used for merging two branches.

Example,
- You have added some features in dev branch.
- It is passed by QA.
- Now to add that feature to release, you need to merge that feature in main/master/production branch.
```
# first switch to branch in which you want to merge.
git checkout master

# Then merge
git merge dev
```
- There is something called squash which is used to merge without commit history.
```
git merge dev --squash
```

Git rebase

It Adds commit history of other branch/remote in linear/sequence way while merging.

Difference:

Merge	Rebase
Only HEAD commit is maintained while merging	Full commit history is maintained while merging in sequence

Example:

While pulling we can use rebase, to reconcile divergent branch.
```
git pull origin master --rebase
```
Rebase a particular branch.
```
git rebase master
```

Cherry pick

Pick a particular commit from any branch and apply to master or any other branch. In simple words apply that particular commit to current branch.

Example:

git cherry-pick <commit-id>

Git stash

Using this your current work is stored somewhere, not commited but tracked by git which can be loaded anytime. This is something where you can store your partial changes and commit later on.

Example:

Stash
```
git stash
```
Apply stash to working dir
```
git stash pop
```
List stashs
```
git stash list
```
Apply a particular stash
```
git stash apply stash@<list-number>
```

So, that’s it.

Git on Dark Kernel

Easy dotfiles management

The easiest way to version control your dotfiles.

Here you can use different branches for different computers, you can replicate you configuration easily on new installation -

Add new change in previous commit

Git concepts

Git

Important branches:

Branching Strategies:

Small team strategy

Big team strategy

Git Revert & Reset

git revert:

Git Reset:

Git Merge

Branch Merge:

Git rebase

Cherry pick

Git stash