4.1 KiB
Git Commands Guide
Getting Started with Git
1. Installing Git
Before you begin, ensure Git is installed on your machine. You can download it from git-scm.com.
2. Check Git Installation
To verify that Git is installed, run:
git --version
3. Configure Git User Information
Set up your name and email address, which will be used for your commits:
git config --global user.name "Your Name"
git config --global user.email "your.email@example.com"
Configuring Git to Use a Custom SSH Key
If you need to use a specific SSH key for your Git operations, you can configure Git as follows:
git config --add --local core.sshCommand 'ssh -i <PATH_TO_SSH_KEY>'
For Clone With Custom SSH Key Use:
git -c core.sshCommand="ssh -i <key-path>" clone host:repo
Replace <PATH_TO_SSH_KEY> with the actual path to your SSH key file.
Creating and Managing a Local Git Repository
1. Initialize a Git Repository
Start by creating a new Git repository in your local project directory:
git init -b main
The -b main flag sets the default branch name to "main".
2. Add Files and Commit Changes
Next, stage all your files and create your initial commit:
git add -A
git commit -m "Initial Commit"
The git add -A command stages all changes, while the git commit command records those changes with a descriptive message.
3. Connect to a Remote Repository
Now, link your local repository to a remote GitHub repository:
git remote add origin <Repo-Link>
Replace <Repo-Link> with the URL of your GitHub repository.
4. Push Changes to GitHub
Finally, push your initial commit to the remote repository:
git push origin main
Common Git Commands for Beginners
1. Check the Status of Your Repository
To see which changes are staged, unstaged, or untracked:
git status
2. View Commit History
To view the commit history of your repository:
git log
show diffrent on each commit
git log -p
show last 3 commit
git log -3
You can press q to exit the log view.
3. Viewing Changes
To see changes made to files before staging them:
git diff
git diff --staged
4. Staging Individual Files
If you want to stage specific files instead of all changes:
git add <filename>
Replace <filename> with the name of the file you wish to stage.
5. Undoing Changes
To unstage a file that you added by mistake:
git reset <filename>
To discard changes in a file and revert it to the last committed state:
git checkout -- <filename>
6. Cloning a Repository
If you want to create a copy of an existing remote repository:
git clone <Repo-Link>
Replace <Repo-Link> with the URL of the repository you want to clone.
7. Creating a New Branch
To create a new branch for development:
git checkout -b <branch-name>
Replace <branch-name> with your desired branch name.
8. Merging Branches
To merge changes from another branch into your current branch:
git merge <branch-name>
rename file
git mv
remove file
git rm
change default editor
git config --global code.editor "vim"
edit last commit message
git commit --amend
show changes in commit
git show <commit-id>
git revert HEAD
git revert <commit-id>
git branch
git branch -v
git branch -d <branch-name>
git checkout <branch-name>
git checkout -b <branch-name>
git merge <target-branch>
on merge with have 2 method:
fast forward: if we are on latest on master and create branch and set some change and merge it ( master not changed ) commit on out branch fast come on head master
3way:if we are on latest on master and create branch and set some change and merge it but this time our master got some change if our brnach dont have conflict with master its merge but with new commit