Git - Pushing & Pulling

Local Repository     ←→     Remote Repository
                           
git pull ←──────────        Your changes
         ──────────→ git push

# Push current branch to its upstream
git push

# Push specific branch to remote
git push origin main

# Push new branch and set upstream
git push -u origin feature-branch
git push --set-upstream origin feature-branch

# Push all branches with tracking
git push --all origin

# Push all tags
git push --tags origin

# Push everything (branches and tags)
git push --all origin && git push --tags origin

# Force push (destructive)
git push --force origin main

# Safer force push (won't overwrite others' work)
git push --force-with-lease origin main

# Pull from tracked remote branch
git pull

# Pull from specific remote and branch
git pull origin main

# Pull with rebase instead of merge
git pull --rebase origin main

# These two commands together
git fetch origin
git merge origin/main

# Or with --rebase
git fetch origin  
git rebase origin/main

# 1. Download latest changes
git fetch origin

# 2. Review what changed
git log HEAD..origin/main --oneline

# 3. See the differences
git diff HEAD origin/main

# 4. Merge when ready
git merge origin/main

# Pull remote changes
git pull origin main

# Resolve any merge conflicts if they occur
# Then push
git push origin main

# Pull with rebase
git pull --rebase origin main

# Resolve any conflicts during rebase
# Then push
git push origin main

# 1. Check status
git status

# 2. Edit conflicted files (remove conflict markers)
nano config.js

# 3. Stage resolved files
git add config.js

# 4. Complete the merge
git commit  # Uses default merge message

# 5. Push the resolution
git push origin main

Before pull:
Local:    A---B---C
Remote:   A---B---D---E

After git pull:
Result:   A---B---C-------F  ← F is merge commit
              \         /
               D---E---/

Before pull:
Local:    A---B---C
Remote:   A---B---D---E

After git pull --rebase:
Result:   A---B---D---E---C'  ← C' is rebased commit

# Always rebase on pull
git config --global pull.rebase true

# Always merge on pull
git config --global pull.rebase false

# Fast-forward only (fail if merge needed)
git config --global pull.ff only

# Push single tag
git push origin v1.0.0

# Push all tags
git push --tags origin

# Push tag with branch
git push origin main --tags

# Delete remote branch
git push origin --delete feature-branch

# Delete remote tag
git push origin --delete v1.0.0

# Alternative syntax for branch deletion
git push origin :feature-branch

# Push to specific remote
git push origin main
git push backup main

# Configure multiple push URLs
git remote set-url --add --push origin [email protected]:user/repo.git
git remote set-url --add --push origin [email protected]:user/repo.git

# Now git push pushes to both

# 1. Switch to main branch
git switch main

# 2. Pull latest changes
git pull origin main

# 3. Create feature branch
git switch -c feature/new-functionality

# 4. Do your work...
# 5. Push feature branch
git push -u origin feature/new-functionality

# Push your work to backup
git add .
git commit -m "Work in progress: implementing feature X"
git push origin feature/new-functionality

# 1. Update main branch
git switch main
git pull origin main

# 2. Rebase feature branch
git switch feature/new-functionality
git rebase main

# 3. Push rebased branch
git push --force-with-lease origin feature/new-functionality

# 4. Create pull request (on GitHub/GitLab)
# 5. After merge, clean up
git switch main
git pull origin main
git branch -d feature/new-functionality

# Test SSH connection
ssh -T [email protected]

# Add SSH key to agent
ssh-add ~/.ssh/id_ed25519

# Check SSH agent
ssh-add -l

# Push with progress info
git push --progress origin main

# Increase Git buffer size
git config --global http.postBuffer 524288000

# Push specific commits only
git push origin a1b2c3d:main

# Repair local repository
git fsck --full

# Reset remote tracking branch
git update-ref refs/remotes/origin/main origin/main

# Re-fetch everything
git fetch --all --prune

# .git/hooks/post-commit
#!/bin/sh
branch=$(git rev-parse --abbrev-ref HEAD)
if [ "$branch" = "main" ]; then
    git push origin main
fi

# .git/hooks/pre-push
#!/bin/sh
# Run tests before push
npm test
if [ $? -ne 0 ]; then
    echo "Tests failed. Push aborted."
    exit 1
fi

# Use SSH for better performance
git remote set-url origin [email protected]:user/repo.git

# Parallel processing
git config --global push.parallel 0

# Compress network traffic
git config --global core.compression 9

# Push specific files only (rare use case)
git add specific-file.txt
git commit -m "Update specific file"
git push origin main

# Pull specific files (using sparse checkout)
git config core.sparseCheckout true
echo "docs/*" > .git/info/sparse-checkout
git pull origin main