Git remove a specific commit(s) from history

 Hi all,

This blog post will let you know about the process of removing the git commit from git history.

Sample Git log

> git log 

38384b3 initial commit

f96751b UI changes

2154131 file added

bf9b9c1 Logic corrections

3e75ab7 Bug fix -> (HEAD)

Use case

Remove the commit "file added"

Procedure

• Rebase in interaction mode one commit above which we want to remove.

> git rebase -i f96751b

• All the commits up to the specified commit will be listed in an order with the prefix "pick". Along with commit messages, the useful commands are available like below.

pick = use commit

reword = use commit, but edit the commit message

edit = use commit, but stop for amending

squash = use commit, but meld into previous commit

fixup = like "squash", but discard this commit's log message

exec = run command (the rest of the line) using shell

drop = remove commit

• Delete the unwanted commits from the file

Press 'd' twice to delete line (in case of vi editor)

• Save and quit the editor

esc -> :wq (in case of vi editor)

• If there are any merge conflicts, resolve it and perform rebase continue

> git rebase --continue

• Once all the merges are completed, perform the push operation

> git push --force-with-lease origin

Hope this helps you make sure, you have clean git history.

Feel free to send your suggestions and comments to psrdotcom@gmail.com

BitBucket to GitHub Repo Migration including history

Hi all,

In this blog, we are going to achieve how we can move/copy the bitbucket repo to GitHub.

Checkout BitBucket Repo

git clone https://USER@bitbucket.org/USER/PROJECT.git

Add GitHub repo as upstream

cd project-folder
git remote add upstream https://github.com:USER/PROJECT.git
Note: To get the already assigned upstreams, use the below command
git remote -v 

Push the branch(es)

git push upstream master
git push --tags upstream

On push unsuccessful, try the below to have same history

git checkout upstreambranch  
git branch main upstreambranch -f    
git checkout main  
git push origin main -f

Add redirect URL

git remote set-url origin git@github.com:USER/PROJECT.git

Clean up the BitBucket (old) repo [Optional]

Verify the content carefully on the GitHub repo

1. Go to BitBucket account
2. Navigate to the respective repository
3. Click Settings -> Delete repository

Hope this helps you to organize the repositories as per your choice to serve the best way for dev and ops.

Please send your feedback and comments to psrdotcom@gmail.com

bash: C:/Program: No such file or directory error solution in git bash with windows directory path having spaces

Hi friends,

Today, I have come across a situation where I have to execute the gitbash on windows with linux commands.

The escape character doesn't alone solve the problem

Problem

Setting up an alias for bash where the path includes space

$ alias DOCKER_HOME=C:/Program Files/Docker/Docker

Error

bash: C:/Program: No such file or directory

Solution

$ alias DOCKER_HOME=C:/"Program\ Files"/Docker/Docker

Hope my solution helps you in resolving the issue.

Please send your feedback and comments to psrdotcom@gmail.com