https://github.com/josemarqmt/personal-git-wiki
:pencil: Personal Git Wiki, notes and main git commands sorted by their usefulness.
https://github.com/josemarqmt/personal-git-wiki
git github
Last synced: 3 months ago
JSON representation
:pencil: Personal Git Wiki, notes and main git commands sorted by their usefulness.
- Host: GitHub
- URL: https://github.com/josemarqmt/personal-git-wiki
- Owner: josemarqmt
- Created: 2024-09-19T13:40:35.000Z (almost 2 years ago)
- Default Branch: main
- Last Pushed: 2024-10-16T13:40:10.000Z (over 1 year ago)
- Last Synced: 2025-01-05T00:16:09.239Z (over 1 year ago)
- Topics: git, github
- Homepage:
- Size: 59.6 KB
- Stars: 0
- Watchers: 1
- Forks: 0
- Open Issues: 1
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# 
Personal Git Wiki (commands and notes for personal use)
1. [Git Fundamentals](#id1)
2. [Git Commands](#id2)
2.1 [Git Config - Get and set repository or global options](#id2.1)
2.2 [Git Essential Commands](#id2.2)
2.3 [Git Repository Management](#id2.3)
2.4 [Git File Management](#id2.4)
2.5 [Git Commit Management](#id2.5)
2.6 [Git Branch Management](#id2.6)
2.7 [Git Remote Repository Management](#id2.7)
2.8 [Git Alias Commands](#id2.8)
2.9 [Git Temporary Storage](#id2.9)
2.10 [Git Transfer Commits Between Branches](#id2.10)
### Main or Master
When you create a git repository, the default brands are Main or Master, often the main ones.
### Git states
- Modified:
The file has changed but there is no confirmation to send.
- Staged:
The file is modified and marked as ready.
- Committed:
The file is saved in the repository.
### Head
The pointer that references the current point in the commit history
### .gitignore
The file indicates that Git should ignore certain file names from being tracked in the repository.
Also is possible to create a .gitignore global file in the home user directory -> "~/.gitignore_global and write" -> "git config --global core.excludesfile" ~/.gitignore_global in the terminal
> Files that should be ignored
>
> Credentials or .env files
>
> ide configuration files
>
> systems files like .DS_Store
>
> log files
>
> Static or build files like /dist or /build directory
### 2.1 Git Config - Get and set repository or global options
> add --system, --global or local to a git config command to specify where the configuration will be established
>
> --system -> The configuration will be applied for the entire systems and repository including all the users
>
> --global -> The configuration will be applied for the current user"
>
> --local -> The configuration will be applied for the current repository"
- Show current git configuration, add --system, --global or --local to filter the configuration you want to see
```
git config --list
```
- Associate username and email to commits in your device
```
git config user.name ""
git config user.email ""
```
- Set git default editor
```
git config --global core.editor "editor name"
```
- Use fast forward merge whenever possible
```
git config --global merge.ff only
```
### 2.2 Git Essential Commands
- Show installed git version
```
git version
```
- Show a command description
```
git --help
```
### 2.3 Git Repository Management
- Initialize a new repository in the folder located
```
git init
```
- Show repository status
```
git status
git status -s # Shows the output of the command in a simplified form.
```
### 2.4 Git File Management
- Track a file and add it to the staging area
```
git add
git add -A #add all the files that have been modified in the repository to the staging area
```
- Stop file tracking and remove it from the staging area
```
git reset
```
- Undo a modified file
```
git restore
git checkout --
```
- Delete all new untracked files (not added to the staging area)
```
git clean -n # shows which files will be deleted
git clean -f # delete the files
```
- Delete a file from the repository but keep it in your file directory
```
git rm --cached
```
### 2.5 Git Commit Management
- Create commits in the repository history with the current state of the files added to the staging area
```
git commit # This will open the previously configured editor to add the message
git commit -m "title" -m "description" # Write the commit title and description directly using the terminal
```
- Add the files to the staging area and commit simultaneously
```
git commit -a -m 'message'
```
- Move HEAD to a previous commit
```
git reset --soft HEAD~1 # The files committed in the last commit will be moved to the staging area
git reset HEAD~1 # The files committed will remain but as unstaged
git reset --hard HEAD~1 # The files committed will lose any changes made and new files will be removed
```
- Add new changes and/or change the message of the last commit
```
git commit --amend -m "message"
```
### 2.6 Git Branch Management
- Create a new branch in the repository based on the current commit of the branch you're on
```
git branch
```
- Switch to an existing branch
```
git switch
```
- Create a new branch and switch to it directly
```
git switch -c
```
- Show a list of available branches locally
```
git branch
# Return the list sorted by creation date
git branch --sort=-committerdate #DESC
git branch --sort=committerdate #ASC
```
- Merges changes made in another branch into the current branch
> git merge uses fast-forward or no fast-forward depending on the state of the branches being merged, but you can choose the merge method using --ff-only, --no-ff, --squash, --no-commit commands
>
> --ff-only -> Used for merge changes of a branch is ahead of the current branch "The branch ahead must share the previous commits that the current branch has in the same order"
>
> --no-ff -> Used for merging two brands that have diverged, git creates a new commit copying the changes of the branch to be merged into the current branch
>
> --squash -> add the changes of the branch to be merged into the staging area instead of automatically committing them "The parent commits are not referenced in the new commit and the history of the feature branch is lost in the main branch’s log"
>
> --no-commit -> same as --squash but the history of both branches is preserved, performing a regular merge
```
git merge
git merge --ff-only # fast forward merge
git merge --no-ff # no fast forward merge
git merge --squash # no automatically commit merge
git merge --no-commit # no automatically commit regular merge
```
- Re-committing all commits of the current branch onto a different base commit
> Use rebase to add changes from a base branch to a branched-out branch and to not create so many merge commits
> Never should be used to add changes to a base branch because you will modify the commit history
```
git rebase
```
- Delete a branch
```
git branch -d # only will delete the branch if the branch is merged
git branch -D # delete the branch regardless of whether it is being merged or not
```
- Prune the local repository of branches pushed to the remote
```
git remote prune --dry-run # return a list of branches that will be deleted if the command is used
git remote prune # delete unnecessary branches
```
### 2.7 Git Remote Repository Management
- Clone a remote repository and bring it locally
```
git clone
```
- Show a list of remote repositories that are linked to the local repository
```
git remote -v
```
- Config git the merge method used when pulling from a repository
```
git config pull.rebase false # use the merge method when fast-forward is not available
git config pull.rebase true # use the rebase method when fast-forward is not available
git config pull.ff only # only accept fast-forward method
```
- Pull changes from a remote repository
```
git pull
```
- Push changes to a remote repository
```
git push
git push -f # force and avoid error message
```
### 2.8 Git Alias Commands
- Create an alias
```
git config --global alias. <"command">
```
- Show a list of configured alias
```
git config --get-regexp alias
```
### 2.9 Git Temporary Storage
> It can be useful to move between branches without having to commit what you have modified
- Save modified files in a temporary storage called stash
```
git stash -m # save track files
git stash -u -m # save track and untracked files
```
- Show a list of saved stashes
```
git stash list
```
- Apply the last temporary stash and remove it from the stack
```
git stash pop
```
- Apply the stash according to an index keeping it in the stack
```
git stash apply
```
- Remove a stash according to an index from the stack
```
git stash drop
```
- Remove all stashes from the stack
```
git stash clear
```
### 2.10 Git Transfer Commits Between Branches
- Apply the commit using its sha reference
```
git cherry-pick
git cherry-pick -e # edit commit message
```