#Git Cheatsheet — Azure DevOps

git config --global user.name  "John Doe"
git config --global user.email "[email protected]"
git config --global init.defaultBranch main
git config --global pull.rebase true
git config --global rebase.autoStash true
git config --global core.autocrlf true   # Windows
git config --global core.longpaths true  # Windows + AEM (path > 260 chars)

git config --global credential.helper manager

git clone https://[email protected]/{org}/{project}/_git/{repo}

ssh-keygen -t ed25519 -C "[email protected]"
# Upload ~/.ssh/id_ed25519.pub → Azure DevOps → SSH Public Keys
git clone [email protected]:v3/{org}/{project}/{repo}

git clone https://dev.azure.com/{org}/{project}/_git/{repo}
git clone --depth=1 <url>                                        # Shallow clone
git clone -b release/v1.2 --single-branch <url>

git remote add upstream https://dev.azure.com/.../_git/{repo}
git remote set-url origin [email protected]:v3/{org}/{project}/{repo}
git remote -v
git fetch --all --prune

git switch -c feature/12345-add-login
git switch main

git branch -a                        # List local + remote branches
git branch -vv                       # Display tracking info
git branch --merged main
git branch --no-merged main

git branch -m old-name new-name
git branch -d feature/done           # Safe delete
git branch -D feature/abandoned      # Force delete
git push origin --delete feature/x   # Delete remote branch

git status -sb
git add file1 file2
git add -p                           # Interactive hunk staging
git add -u                           # Tracked files only

git commit -m "feat(login): add Azure AD SSO #12345"
git commit -am "Subject"
git commit --amend
git commit --amend --no-edit

git diff                             # Working tree vs index
git diff --staged                    # Index vs HEAD
git diff main...feature/x
git diff --stat / --name-only

git log --oneline --graph --all --decorate -20
git log --author="John" --since="1 week ago"
git log -p path/to/file
git log -S"functionName"             # Search commits modifying symbol
git log --follow path/file           # Trace across file renames

git blame -L 50,100 file.java
git blame -w -M -C file.java         # Ignore whitespace, detect moves/copies

git fetch origin
git fetch --prune
git fetch --all --tags

git pull --rebase origin main
git pull --ff-only

git push -u origin feature/12345
git push --force-with-lease         # Do NOT force push to main/develop/release/*
git push --tags

git switch feature/12345
git fetch origin
git rebase origin/main
# Conflict → resolve → git add → git rebase --continue
# Abort    → git rebase --abort
git push --force-with-lease

git rebase -i origin/main

git commit --fixup=<sha>
git rebase -i --autosquash origin/main

git merge --no-ff feature/12345     # Preserve merge commit
git merge --ff-only feature/12345   # Fast-forward only
git merge --squash feature/12345    # Squash into single commit
git merge --abort

git switch release/v1.2
git cherry-pick <sha>
git cherry-pick <sha1> <sha2> <sha3>
git cherry-pick A..B                 # Commit range (exclusive..inclusive)
git cherry-pick -n <sha>             # Stage changes without committing

# Conflict → git add → git cherry-pick --continue
# Abort    → git cherry-pick --abort

git stash push -m "WIP login form"
git stash push -u                    # Include untracked files
git stash list
git stash show -p stash@{0}
git stash pop                        # Apply and drop stash entry
git stash apply stash@{0}            # Apply and retain stash entry
git stash drop stash@{0}
git stash clear
git stash branch new-branch          # Create new branch from stash

git tag -a v1.2.0 -m "Release 1.2.0"   # Annotated tag (recommended)
git tag v1.2.0-rc1                       # Lightweight tag
git tag -a v1.2.0 <sha> -m "..."        # Tag historic commit

git push origin v1.2.0
git push --tags

git tag -d v1.2.0
git push origin --delete v1.2.0

git tag --sort=-creatordate | head

git submodule add https://dev.azure.com/.../_git/project-a project-a
git submodule update --init --recursive
git submodule update --remote --merge
git clone --recurse-submodules <url>

git clone --filter=blob:none --no-checkout <url>
cd repo
git sparse-checkout init --cone
git sparse-checkout set project-a shared-libs
git checkout main

git sparse-checkout add project-b
git sparse-checkout disable

az extension add --name azure-devops
az devops login
az devops configure --defaults organization=https://dev.azure.com/{org} project={project}

az repos pr create \
  --repository my-repo \
  --source-branch feature/12345-add-login \
  --target-branch main \
  --title "feat(login): Add Azure AD SSO #12345" \
  --work-items 12345 \
  --reviewers [email protected] [email protected] \
  --delete-source-branch true \
  --auto-complete true \
  --squash true

az repos pr list --status active
az repos pr show --id 123
az repos pr set-vote --id 123 --vote approve
az repos pr update --id 123 --status completed
az repos pr work-item add --id 123 --work-items 12345

# Rebase conflict resolution
git mergetool                        # Or manually edit conflict markers <<<<< ===== >>>>>
git add path/file
git rebase --continue
git rebase --abort                   # Abort rebase

# Accept changes from one side
git checkout --ours   path/file      # Keep current branch version
git checkout --theirs path/file      # Accept incoming branch version
git add path/file

echo "ui.content/**/.content.xml merge=ours" >> .gitattributes
git config merge.ours.driver true

# Unpushed commit
git reset --soft HEAD~1   # Remove secret and recommit

# Already pushed — rewrite history and notify team
git filter-repo --invert-paths --path path/to/secret.txt
git push --force-with-lease
# Revoke compromised PAT/secret immediately in Azure DevOps Portal

# Start of workday
git fetch --all --prune
git switch main && git pull --rebase

# Create new feature branch
git switch -c feature/12345-desc
# ... work on code ...
git add -p
git commit -m "feat(scope): message #12345"

# Before PR — clean up history
git fetch origin
git rebase -i origin/main
git push -u origin feature/12345-desc
# Or use force-with-lease if previously pushed
git push --force-with-lease

# Create PR
az repos pr create --source-branch feature/12345-desc --target-branch main \
  --title "..." --work-items 12345 --auto-complete true --squash true

# After PR merge
git switch main && git pull --rebase
git branch -d feature/12345-desc