Git & Github on Aamnah - Frontend Web Developer

Git ignore ALL caches

Wed, 28 Jul 2021 12:21:31 +0500

Needed to do this for a WordPress site for which the source has been committed. The issue with WordPress is that there are too many caches! The plugins will add their own, the theme will add their own and so on..

Find all folders with cache in their name to get an idea of what you’re ignoring..

1find . -type d -name *cache

./wp-content/et-cache
./wp-content/cache
./wp-content/plugins/wp-rocket/views/cache
./wp-content/themes/Divi/core/components/cache
./wp-content/wphb-cache

Add the following to your .gitignore file

Add git info to Bash prompt

Wed, 28 Jul 2021 11:46:37 +0500

On my MacBook i have ZShell and an amazing custom prompt. This is more for my remote Ubuntu servers where i have hosted code and would like the git info in the prompt

1# find your git version and download the files `git-completion.bash` and `git-prompt.sh`
2GIT_VERSION=`git version | sed 's/git version //'`
3
4wget -O ~/git-prompt.sh https://raw.githubusercontent.com/git/git/v${GIT_VERSION}/contrib/completion/git-prompt.sh
5
6# one liner
7# wget -O ~/git-prompt.sh https://raw.githubusercontent.com/git/git/v`git version | sed 's/git version //'`/contrib/completion/git-prompt.sh

Add the following to the end of your ~/.bashrc

Size differences between `git clone`, `git clone --mirror` and `git clone --depth 1`

Mon, 22 Jun 2020 12:19:38 +0500

Trying to determine how i can only get essential git files when cloning repos and how much of a difference different ways of cloning the repo make on file size and bandwidth used.

git clone

1git clone git@bitbucket.org:myBigRepo/myBigRepo.git

Cloning into 'myBigRepo'...
remote: Counting objects: 78060, done.
remote: Compressing objects: 100% (21470/21470), done.
remote: Total 78060 (delta 58468), reused 74919 (delta 55574)
Receiving objects: 100% (78060/78060), 565.34 MiB | 1.60 MiB/s, done.
Resolving deltas: 100% (58468/58468), done.
Checking out files: 100% (11463/11463), done.

565.34 MiB

Convert commits to branches and bring back reverted changes with cherry-pick

Mon, 08 Apr 2019 00:00:01 +0500

Scenario:

i have 3 old commits that were reverted and which i need to add back to code
i want all those commits to be in one (new) branch and pushed as one change (feature)
i don’t want the history or any commits that happened in between, i want ONLY the code that was changed inside that particular commit
(optional) squash all commits into one and push it to remote

 1# create a new branch, we use Gitflow
 2git flow feature start bringBackChange
 3# git checkout -b bringBackChange 
 4
 5# cherry pick a commit
 6git cherry-pick -x abc123 
 7
 8# pick multiple commits
 9git cherry-pick -x 456def ghi789
10
11# resolve conflicts and continue
12git cherry-pick --continue
13
14# bail out
15git cherry-pick --abort

-x will add a message saying that this commit was cherry pciked

(cherry picked from commit abc123)

--no-commit, bring the changes but don’t commit

NOTES:

Ignoring files and folders in Git

Wed, 03 Apr 2019 16:48:07 +0500

Create a global .gitignore

1touch ~/.gitignore_global
2git config --global core.excludesfile ~/.gitignore_global

foo/ will match a directory but not a file or symbolic link
foo without the / is a glob pattern
**/foo will match a file or directory anywhere

Remove files that are ignored now but are still in the Git repo

1git rm -r --cached node_modules
2git commit -m 'Remove the now ignored directory node_modules'
3git push origin master

s Links

Git in Production

Wed, 27 Mar 2019 16:44:07 +0500

Pretty and concise logs

add an alias

1nano ~/.gitconfig

[alias]
	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --branches

You can now use git lg to see better logs

Change commit message of last commit

1git commit --amend

It’ll open the editor and you’ll be able to update the last commit message. Only do this for unpushed code

Add a file i forgot in last commit

1git commit --amend

When you run the command it’ll automatically include the newly modified files. Only do this for unpushed code

Gitflow

Thu, 21 Mar 2019 09:49:29 +0500

Gitflow

 1# macOS
 2brew install git-flow
 3
 4# Linux
 5sudo apt install git-flow
 6
 7# Wndows
 8# https://github.com/nvie/gitflow/wiki/Windows
 9
10# Initiate Gitflow inside your repo
11git flow init

Main and supporting branches:

master
develop
feature/
hotfix/
release/

Master branch `master/`

This is the production branch for live, released code. develop gets merged into master whenever you release. Do not work on this branch directly, your commits will always come via develop or hotfix. The master and develop branches are long-running branches and you do not commit directly into them.

Replace and overwrite branches in Git

Tue, 12 Mar 2019 17:04:19 +0500

tl;dr

1# merge a branch on top of your existing master
2git checkout hotstuff
3git merge -s ours master
4git checkout master
5git merge hotstuff

NOTES:

-s ours or --strategy=ours will get rid of all changes in the other (obsolete) branch and overwrite with our branch (the branch you’er currently in).
If you are using our with a master branch, it’ll overwrite everything in master and prefer changes in the other branch
You can use --no-commit when merging to avoid the need of a commit message

You can also try obliterating master all together:

Delete files forever from a git repo on Github or Bitbucket

Tue, 25 Dec 2018 10:28:52 +0500

tl;dr

1git clone --mirror REPO_URL
2java -jar ~/Downloads/bfg-1.13.0.jar --delete-files FILE_NAME MY_REPO.git
3cd MY_REPO.git
4git reflog expire --expire=now --all && git gc --prune=now --aggressive
5git push # this will force update all refs as well because you cloned with --mirror

 1# see if java is installed
 2echo $(/usr/libexec/java_home)
 3
 4# download and install Java
 5# https://java.com/en/download/mac_download.jsp
 6# jre-8u191-macosx-x64.dmg
 7
 8# to use Java runtime and command line tools you need to install Java Developer Kit
 9# install JDK
10# https://www.oracle.com/technetwork/java/javase/downloads/index.html
11# jdk-11.0.1_osx-x64_bin.dmg
12
13# download BFG Repo-Cleaner
14# https://rtyley.github.io/bfg-repo-cleaner/
15
16# check that BFG works 
17java -jar ~/Downloads/bfg-1.13.0.jar
18
19# mirror the repo
20# clone a fresh copy of your repo, using the --mirror flag
21git clone --mirror git@bitbucket.org:aamnah/deleteme.git
22
23# use bfg
24java -jar ~/Downloads/bfg-1.13.0.jar --delete-files id_rsa deleteme.git
25
26# go to the repo, cleanup, and push changes
27cd deleteme.git
28git reflog expire --expire=now --all && git gc --prune=now --aggressive
29git push # this will force update all refs as well because you cloned with --mirror

So i pushed some files that were personal to a public Github repo. Nothing too damaging but still stuff i wouldn’t want to be included on a tech blog.

move master branch from one repo as the master branch to another repo, without merging

Tue, 25 Dec 2018 00:00:00 +0500

old repo is on Github, new repo is on Bitbucket
old site was built with Jekyll, new site is built with Hugo
create a new branch, checkout from within master

1git checkout -b jekyll
2git push -u origin jekyll

delete everything inside the master of old repo

1git checkout master
2rm -rf ./*

1git remote add bitbucket git@bitbucket.org:aamnah/tldrdevnotes.com.git
2git remote update

1git merge --allow-unrelated-histories bitbucket/master

Clone and Push all branches

Tue, 18 Dec 2018 16:15:59 +0500

tl;dr

1git clone --mirror URL
2cd NEW_REPO
3# git remote NEW_REMOTE URL
4# for remote in `git branch -r | grep -v '\->' | sed 's/ origin\///'`; do git branch --track $remote; done
5# git push NEW_REMOTE master -u 
6git push --mirror NEW_REMOTE_URL

--mirror is supposed to be used when you don’t have a working copy locally.

Clone the repo with all branch refs

Better to do this if you don’t have any local changes and are just migrating the branch from one palce to another.

Common Git/Github Errors

Sun, 21 May 2017 00:00:04 +0500

fatal: refusing to merge unrelated histories

$ git pull origin master
From github.com:aamnah/myproject.com
 * branch            master     -> FETCH_HEAD
fatal: refusing to merge unrelated histories

Newly created Guthub repo, has only a .gitignore file that the local repo doesn’t. can’t push without pulling first.

Solution: You can use --allow-unrelated-histories to force the merge to happen.

source

Git & Github on Aamnah - Frontend Web Developer

Git ignore ALL caches

Add git info to Bash prompt

Size differences between `git clone`, `git clone --mirror` and `git clone --depth 1`

git clone

Convert commits to branches and bring back reverted changes with cherry-pick

Ignoring files and folders in Git

s Links

Git in Production

Pretty and concise logs

Change commit message of last commit

Add a file i forgot in last commit

Gitflow

Gitflow

Master branch master/

Replace and overwrite branches in Git

Delete files forever from a git repo on Github or Bitbucket

move master branch from one repo as the master branch to another repo, without merging

Clone and Push all branches

Clone the repo with all branch refs

Common Git/Github Errors

fatal: refusing to merge unrelated histories

Master branch `master/`