This article is just to collect some of the Git commands that are being used on a regular basis.
Git commands for daily work
git clone <https link to repo> (clone a remote repo. Make sure you’re
in the correct directory when running)
git pull (sync the latest changes from remote repo)
git checkout -b feature/new_branch_name (create new feature branch)
git switch -c feature/new_branch_name (create new feature branch)
git checkout main (switch to main branch)
git switch main (switch to main branch)
git add -A (pre-commit/stage command to add all new/modified/deleted files to local staging for whole repo, run this before local commit)
git add . (same as -A but for current directory and sub directories only)
git add -u (stages all modified and deleted files but leaves new and untracked files)
git commit -a -m "adding a test file"
(commit all files to local branch and add a message)
git push --set-upstream origin feature/testingbranch (publish local branch to remote repo, use the same name as the current feature
branch)
The git push command can be simplified further, see below around the push.autoSetupRemote setting (then you can just use git push).
git add -A && git commit -a -m "adding a test file" (combine git add and git commit and run sequentially)
git checkout main && git pull (combine switch to main branch and run git pull)
git branch -d localBranchName (delete local branch)
git push origin --delete remoteBranchName (delete branch remotely)
git branch -l (list local branches)
git branch --all (see all branches including remote)
Undo last commit
If you've pushed a local repo to a remote repo and also created a PR in e.g. Azure DevOps, you can undo the last commit, make some changes or remove/add files and re-push the changes:
git reset --soft HEAD~1 (undo last commit)
git add -A (run this after changes have been made to re-stage)
git commit -a -m "updated commmit message"
git push --force (this will overwrite the remote branch history. If you don't use --force it will throw an error that remote branch is ahead)
Load everything from remote branch and overwrite local branch
git switch my-local-branch
git fetch origin
git reset --hard origin/my-remote-branch
Git commands configuring Git
git config --global
user.name "First Last" (user name and email should be set up as a one time config)
git config --global user.email <user@email.com>
git config --global core.longpaths true (fixes an error with long path names)
git config --list (show git config)
git config --list --show-origin (show git config including where variables are defined)
git config --global http.https://dev.azure.com/.proxy https://someaddress (this is a proxy related setting)
git config --global http.https://dev.azure.com/.proxyauthmethod
negotiate (this is a proxy related setting)
git config --global http.https://dev.azure.com/.emptyAuth
true (this is a proxy related setting)
git config --global --edit (edit the global config file in VI editor)
git config --global --replace-all user.name "username" (replaces current user name)
git config --global --replace-all user.email <user@email.com>
git config --unset-all credential.helper (unset named settings)
git config --global --set credential.helper (set the credentials helper type)
Note, that if you set push.autoSetupRemote to true with the below command, it is enough to just run: git push and you don't have to specify (--set-upstream origin feature/testingbranch) and it will automatically create a remote branch with same name as current local branch and enable tracking, see more info here:
git config --global --add --bool push.autoSetupRemote true
