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 »
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 »
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:
|
1 2 3 4 5 6 7 8 9 10 11 12 13 |
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:
|
1 2 3 4 5 6 7 |
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
1. Checkout The git checkout moves the HEAD ref pointer to a specified commit. To demonstrate this, consider the following example:
|
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 |
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:
|
1 |
git checkout <commit-id> |
or
|
1 |
git checkout HEAD~<number> |
you can find all commits again by:
|
1 |
git log --all |
For instance:
|
1 |
git checkout HEAD~2 |
|
1 |
gitk --all |
1.2 Detached HEAD Any checkout of a commit that is not
Creating a bare repository
|
1 2 3 4 5 |
mkdir remote_repose1 remote_repose2 cd remote_repose1 git init --bare cd ../remote_repose2 git init --bare |
Creating a repositiy
|
1 2 3 |
mkdir repos1 repos2 cd repos1/ git init . |
Managing remotes You need to know how to handle your remote repositories in order to be able to work on any Git project. Remote repositories are copies of your project which are hosted elsewhere on the Internet or the network. You can have several of them,
Mastering git, Part 2, Creating and managing repositories Read More »
Installing prerequisite
|
1 |
sudo apt-get install git-gui gitk meld kdiff3 |
Configuring Git Environment First config your environment and set a proper merge/ diff tool. The settings in Linux are under/home/<username>/.gitconfig. If you don’t know where this file is located in your OS You can easily edit this file by:
|
1 |
git config --global -e |
All Git settings can be set or viewed via terminal, i.e:
|
1 |
git config --list --show-origin |
Mastering git, Part 1, setting up git environment, GUI, mergetool, difftool Read More »
