Git¶

Configuration¶

Before you run any command you hate to configure git once on your machine

git config --global user.name "Your name"

git config --global user.emal "Your email"

Start a new project

git init

Clone a remote project (here an example with Win11Debloat)

git clone https://github.com/Raphire/Win11Debloat.git

ACP: Add, Commit, Push

To see what is modified, staged and your branch

git add myfile.py

git commit -m "feat: add /user api endpoint"

git push -u origin main

Will push the local main branch over the remote main branch.

-u option allow saving the link between remote branch main and the local branch main. Thus, you will be able to only write git push.

To see both remote and local branch

git branch -a

To see link between local and remote branch

git branch -vv

To switch branch to dev

git switch dev

While branch are an active line of development, tag are static pointer to a specific moment in your repo history.

Tags are immutable while branch are mutable.

When you are satisfied of your app, and you went to set a version run:

git tag -a v1.0.0 -m "First stable version with auth"

Then you have to push the tag.

git push origin v1.0.0

git add .

git commit -m "feat: add user logout"

git tag -a v1.0.0 -m "First version with auth"

git puhs origin main --follow-tags

This last command will push branch and tags.

Rebasing allow you to reorganized pasted commits.

Go to main

git switch main

Get last commit of main

git pull

Create a new branch for your feature

git switch -b feature/add-new-section

Code your feature and make several commits

git add .

git commit -m "wip: add something"

When you finish, get lasts commit of main that were created during development of your feature

git fetch origin

Apply your branch over the last commit of main, conflict may happend here

git rebase origin/main

Resolve conflicts if any then

git rebase --continue

Clean your commits

git rebase -i HEAD~10

Push the branch

git push --force-with-lease