Skip to content

Latest commit

 

History

History

21_GIT

Folders and files

NameName
Last commit message
Last commit date

parent directory

..
 
 
 
 

GIT: Operations

Gitflow:

https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

Rebase

Rebase main onto feature:

git checkout feature
git rebase main
git pull --rebase # or git push -f
git push

Revert to commit:

git revert --no-commit 0766c053..HEAD
git commit

Beyond Compare

https://www.scootersoftware.com/download.php?zz=kb_linux_install

Simple Compare

git diff HEAD^ HEAD Makefile

Dependencies access

In file ~/.gitconfig:

[url "[email protected]:"]
        insteadOf = https://github.com/

Resources

https://nitayneeman.com/posts/understanding-semantic-commit-messages-using-git-and-angular/
https://www.toptal.com/front-end/guide-to-monorepos
https://www.devroom.io/2009/10/26/how-to-create-and-apply-a-patch-with-git/
https://www.devroom.io/2020/03/09/the-git-submodule-cheat-sheet/
https://www.youtube.com/watch?v=__cR7uPBOIk
https://phoenixnap.com/kb/how-to-resolve-merge-conflicts-in-git
https://www.w3docs.com/snippets/git/how-to-change-commit-message.html