Skip to content

Latest commit

 

History

History
120 lines (70 loc) · 2.45 KB

git.md

File metadata and controls

120 lines (70 loc) · 2.45 KB
Raw

Git

M  package.j # FIRST FROM STAGE TO HEAD
MM package.j # FIRST FROM STAGE TO HEAD + FROM TRACKED FILE TO STAGE
UU src/compo # IN MERGE / FROM BRANCH AND HEAD ARE UPDATED
UD src/compo # IN MERGE / FROM BRANCH UPDATED AND DELETE FROM HEAD

User Local Files

~/.gitconfig

~/.git-credentials

hooks

https://githooks.com/

Learn git TUTORIALS

https://realpython.com/python-reduce-function/

https://ohmygit.org/
An open source game about learning Git!

Best Practice

https://initialcommit.com/blog/git-commit-messages-best-practices

PRO TIPs: My own journy / flow

From commit to working dir / stage area

Using git cherry-pick in combination with the --no-commit flag allows you to apply the changes while keeping them in the working directory and the staging area, instead of automatically creating a new commit.

git cherry-pick --no-commit <commit_hash>
Make an PR before to delete a branch, bc pr closed can restore the branch.
git log --name-status

https://stackoverflow.com/questions/8691199/what-does-t-mean-in-git-status-it-isnt-in-the-man-page

Git Branching Strategy

https://www.flagship.io/git-branching-strategies/

Gitflow Workflow

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

Git Submodules

PROTIPS

update directly with git submodule to fetch the submodules changes
use git submodule set-branch -b dev common-modules to track specific branch in a submodule
PROTIP: Always use submodules via $ git submodules <>, and not via .gitmodules, bc it updates all the refs required.

Git checkout on the parent repo does not change auto to the child repos: Once you checkout the desired branch that points to specific commits you should point the specific commits with git submodule init && git submodule update

https://git-scm.com/book/en/v2/Git-Tools-Submodules

https://dev.to/colinmcd01/git-submodules-gbp

https://stackoverflow.com/questions/4526910/rename-a-git-submodule

Git WorkTree | Manage multiple working trees

https://git-scm.com/docs/git-worktree

https://opensource.com/article/21/4/git-worktree

Pro: My alias

gwt='git worktree'
gwta='git worktree add'
gwtls='git worktree list'
gwtmv='git worktree move'
gwtrm='git worktree remove'

Git Tree

https://dev.to/nichartley/whats-a-git-tree-5149

https://git-scm.com/docs/git-ls-tree

Monorepos

https://monorepo.tools/