Robotics with ROS

Adding Qt UI files to your CMake

Clang format and code beautifier for Qt Creator

Leave a Comment / C++, Tutorials / admin

Clang format and code beautifier for Qt Creator Different developers use different styles with different IDE (i.e some people use space, some use tab) which may cause lots of changes in your git repository. One solution to this is to use some standard code formatting and beautifier. clang is a great tool for this purpose

Clang format and code beautifier for Qt Creator Read More »

Everything you need to know to master git, Part 10, git fork

Leave a Comment / Git, Tutorials / admin

Forking Projects You can “fork” the project if you want to contribute to an existing project to which you do not have push access. GitHub can make a copy of the project that is fully yours when you “fork” a project; it resides in your namespace, and you can push it. By creating what is

Everything you need to know to master git, Part 10, git fork Read More »

Mastering git, Part 9, git Submodule

Leave a Comment / Git, Tutorials / admin

Set up: This allows the repository to be local a file directory:

ROOT=/tmp
echo $ROOT
git config --global protocol.file.allow always

ROOT=/tmp

echo $ROOT

git config --global protocol.file.allow always

Create remote:

cd $ROOT
mkdir remote
git init --bare remote

cd $ROOT

mkdir remote

git init --bare remote

Creating repos1

mkdir repos1
cd $ROOT/repos1
git init
touch main.cpp
git add .
git commit -m 'main.cpp added'

git remote add origin ../remote/
git push --set-upstream origin master
git push origin master

mkdir repos1

cd $ROOT/repos1

git init

touch main.cpp

git add .

git commit -m 'main.cpp added'

git remote add origin ../remote/

git push --set-upstream origin master

git push origin master

Creating lib1

cd $ROOT
mkdir lib1
cd $ROOT/lib1
git init .
touch vision.hpp
git add .
git commit -m 'vision.hpp added' 

# this alows to push into this repository, as it is a non-bare repository 
git config --local receive.denyCurrentBranch updateInstead

cd $ROOT

mkdir lib1

cd $ROOT/lib1

git init .

touch vision.hpp

git add .

git commit -m 'vision.hpp added'

# this alows to push into this repository, as it is a non-bare repository

git config --local receive.denyCurrentBranch updateInstead

Adding lib1 as submodule to repos1

cd $ROOT/repos1
git submodule add ../lib1/
git diff --cached lib1/

# This command lists the submodules recorded in the .gitmodules file along with their current checked out commit.
git submodule

# Gives you the commit from repose lib1 that has been added 
git ls-tree master

git add .
git commit -m 'lib1 as submodule added'
git push origin master

cd $ROOT/repos1

git submodule add ../lib1/

git diff --cached lib1/

# This command lists the submodules recorded in the .gitmodules file along with their current checked out commit.

git submodule

# Gives you the commit from repose lib1 that has been added

git ls-tree master

git add .

git commit -m 'lib1 as submodule added'

git push origin master

Cloning a Project with Submodules to repos2

cd $ROOT
mkdir $ROOT/repos2
cd $ROOT/repos2
git clone $ROOT/remote/ .
git submodule init
git submodule update

# Simpler way:
# git clone --recurse-submodules ../remote/ .

#If you already cloned the project and forgot --recurse-submodules, you can combine the git submodule init and git submodule update

# We are in Detached HEAD State
cd $ROOT/repos2/lib1/
git checkout master
git branch -vv

cd $ROOT

mkdir $ROOT/repos2

cd $ROOT/repos2

git clone $ROOT/remote/ .

git submodule init

git submodule update

# Simpler way:

# git clone --recurse-submodules ../remote/ .

#If you already cloned the project and forgot --recurse-submodules, you can combine the git submodule init and git submodule update

# We are in Detached HEAD State

cd $ROOT/repos2/lib1/

git checkout master

git branch -vv

Working on Submodule lib1 in repos2:

cd $ROOT/repos2/lib1/
touch reader.hpp
git add .
git commit -m 'reader added from repos2'
cd  ../
git add .
git commit -m 'submodule lib1 updated'
git push

cd $ROOT/repos2/lib1/

touch reader.hpp

git add .

git commit -m 'reader added from repos2'

cd ../

git add .

git commit -m 'submodule lib1 updated'

git push

Pulling in Upstream Changes from the Submodule Remote in repos1:

cd $ROOT/repos1/lib1
git fetch
git merge
now 
cd ../
git diff --submodule

# There is an easier way to do this 
git submodule update --remote

cd $ROOT/repos1/lib1

git fetch

git merge

now

cd ../

git diff --submodule

# There is an easier way to do this

git submodule update --remote

Mastering git, Part 9, git Submodule Read More »

Mastering git, Part 8, git Hook

Leave a Comment / Git, Tutorials / admin

A git hook is a script that Git executes before or after an event such as committing, pushing, or receiving code. Git hooks are a built-in feature of Git that allows you to perform custom actions at specific points in the Git workflow. They are stored in the .git/hooks directory in a Git repository, and

Mastering git, Part 8, git Hook Read More »

Mastering git, Part 7, git branch and tag

Leave a Comment / Git, Tutorials / admin

1. Creating a branch It quite often happens that a software product is on a git server and developers add new features to the product. To make the job easier, developers usually create branches beside the master branch (which is the default branch) and work on their branch and once the changes are confirmed and

Mastering git, Part 7, git branch and tag Read More »

Mastering git, Part 6, git stash

Leave a Comment / Git, Tutorials / admin

Sometimes you have made some changes into your local copy and you don’t want to make a commit because your code doesn’t compile, but something came up and you should change your branch for instance and you will lose your local changes. In this situation, you can stash your changes and save your changes and

Mastering git, Part 6, git stash Read More »

Mastering git, Part 5, git cherry-pick

Leave a Comment / Git, Tutorials / admin

Git cherry-picking is a feature in Git that allows you to select and apply specific commits from one branch to another, rather than merging the entire branch. This can be useful when you want to apply a specific change or fix to a different branch, without merging the entire branch. Imagine the following situation, you

Mastering git, Part 5, git cherry-pick Read More »

Mastering git, Part 4, git merge, git diff with GUI tools, view git history (commit log), blame

Leave a Comment / Git, Tutorials / admin

Diff Before following this post, make sure you have already set up everything from my other post regarding the configuration of the git environment. Diff command will allow you to compare two different commits, let’s set up a repository:

mkdir repos1
mkdir repos2
mkdir remote_repose

cd repos1
git init
git init --bare ../remote_repose/
git remote add origin ../remote_repose/

touch A.txt
git add -A
git commit -a -m 'A Added'
git push --set-upstream origin master

mkdir repos1

mkdir repos2

mkdir remote_repose

cd repos1

git init

git init --bare ../remote_repose/

git remote add origin ../remote_repose/

touch A.txt

git add -A

git commit -a -m 'A Added'

git push --set-upstream origin master

Now in the second repository, we make some changes:

cd ../repos2/
git clone ../remote_repose/ .
touch B.txt
date > A.txt
git add -A
git commit -m 'some changes'
git push

cd ../repos2/

git clone ../remote_repose/ .

touch B.txt

date > A.txt

git add -A

git commit -m 'some changes'

git push

now let’s back to the first repository and see

Mastering git, Part 4, git merge, git diff with GUI tools, view git history (commit log), blame Read More »

Mastering git, Part 3 (Undo local changes, git revert, git reset, git amend and git clean)

Leave a Comment / Git, Tutorials / admin

1. Checkout The git checkout moves the HEAD ref pointer to a specified commit. To demonstrate this, consider the following example:

mkdir remote_repose
mkdir repos && cd repos
git init
git init --bare ../remote_repose/
git remote add origin ../remote_repose/

touch A.txt
git add -A

git commit -a -m 'A Added'
git push --set-upstream origin master

touch B.txt
git add -A
git commit -a -m 'B Added'
git push

touch C.txt
git add -A
git commit -a -m 'C Added'
git push

touch D.txt
git add -A
git commit -a -m 'D Added'
git push

mkdir remote_repose

mkdir repos && cd repos

git init

git init --bare ../remote_repose/

git remote add origin ../remote_repose/

touch A.txt

git add -A

git commit -a -m 'A Added'

git push --set-upstream origin master

touch B.txt

git add -A

git commit -a -m 'B Added'

git push

touch C.txt

git add -A

git commit -a -m 'C Added'

git push

touch D.txt

git add -A

git commit -a -m 'D Added'

git push

Now you can change the HEAD with:

git checkout <commit-id>

1	git checkout <commit-id>

git checkout HEAD~<number>

1	git checkout HEAD~<number>

you can find all commits again by:

git log --all

1	git log --all

For instance:

git checkout HEAD~2

1	git checkout HEAD~2

gitk --all

1	gitk --all

1.2 Detached HEAD Any checkout of a commit that is not

Mastering git, Part 3 (Undo local changes, git revert, git reset, git amend and git clean) Read More »

Cookie	Duration	Description
cookielawinfo-checbox-analytics	11 months	This cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Analytics".
cookielawinfo-checbox-functional	11 months	The cookie is set by GDPR cookie consent to record the user consent for the cookies in the category "Functional".
cookielawinfo-checbox-others	11 months	This cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Other.
cookielawinfo-checkbox-necessary	11 months	This cookie is set by GDPR Cookie Consent plugin. The cookies is used to store the user consent for the cookies in the category "Necessary".
cookielawinfo-checkbox-performance	11 months	This cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Performance".
viewed_cookie_policy	11 months	The cookie is set by the GDPR Cookie Consent plugin and is used to store whether or not user has consented to the use of cookies. It does not store any personal data.