Git Commands for DevOps Engineers

As a 🛠️ DevOps engineer, mastering 🌀 Git is essential for managing 📂 source code, collaborating with 👥 team members, and automating ⚙️ CI/CD pipelines. Below is a comprehensive guide to 🌀 Git commands tailored for 🛠️ DevOps workflows.

1. Setup and Configuration

Set Up User Details:

# Configure 👤 username and 📧 email
git config --global user.name "Your Name"
git config --global user.email "youremail@example.com"

# Check 🛠️ configuration
git config --list

Set Up Aliases:

# Create shortcuts for 🔄 common commands
git config --global alias.st status
git config --global alias.co checkout
git config --global alias.br branch
git config --global alias.cm commit

2. Repository Management

Create and Clone Repositories:

# Initialize a new 🌀 Git repository
git init

# Clone an existing 🌐 repository
git clone <repository_url>

3. Working with Branches

Branch 🌿 Operations:

# Create a new 🌿 branch
git branch <branch_name>

# Switch to a 🌿 branch
git checkout <branch_name>

# Create and switch to a 🌿 branch
git checkout -b <branch_name>

# List all 🌿 branches
git branch -a

Merge 🌿 Branches:

# Merge a 🌿 branch into the current 🌿 branch
git merge <branch_name>

Delete 🌿 Branches:

# Delete a local 🌿 branch
git branch -d <branch_name>

# Delete a remote 🌐 branch
git push origin --delete <branch_name>

4. Making Changes

Track 🔄 Changes:

# Check the status of the 🖥️ working directory
git status

# Add 📂 files to the staging area
git add <file_name>

# Add all 🔄 changes
git add .

# Commit 🔄 changes
git commit -m "Your commit message"

# Amend the last commit
git commit --amend

Stash 📦 Changes:

# Stash 📦 uncommitted changes
git stash

# Apply stashed 📦 changes
git stash apply

# List all stashed 📦 changes
git stash list

5. Collaborating with Remote 🌐 Repositories

Push and Pull 🔄 Changes:

# Push 🔄 changes to a remote 🌐 repository
git push origin <branch_name>

# Pull 🔄 changes from a remote 🌐 repository
git pull origin <branch_name>

Fetch 🔄 Changes:

# Fetch 🔄 changes from a remote 🌐 repository
git fetch origin

Resolve ⚡ Conflicts:

# Show ⚡ conflicts
git status

# Resolve ⚡ conflicts manually, then add the resolved file
git add <file_name>

# Continue the merge 🔄 process
git commit

6. Tracking and Debugging 🐛

View Logs and History 📜:

# View commit 📜 history
git log

# View a simplified commit 📜 history
git log --oneline

# View changes in a 📂 file
git diff <file_name>

Revert 🔄 Changes:

# Revert a commit by creating a new 🔄 commit
git revert <commit_hash>

# Reset to a specific commit (destructive 💥)
git reset --hard <commit_hash>

# Reset 📂 files to the last commit
git checkout -- <file_name>

7. Working with Tags 🏷️

Tag Management:

# Create a 🏷️ tag
git tag <tag_name>

# Push a 🏷️ tag to a remote 🌐 repository
git push origin <tag_name>

# List all 🏷️ tags
git tag

8. Advanced 🌀 Git Commands

Cherry-Pick Commits 🍒:

# Apply a specific 🍒 commit from another 🌿 branch
git cherry-pick <commit_hash>

Rebase 🔄:

# Rebase the current 🌿 branch onto another 🌿 branch
git rebase <branch_name>

Squash Commits 🥞:

# Combine multiple commits into one during a rebase 🔄
git rebase -i <commit_hash>

9. Automating 🌀 Git Commands

Create 🪝 Hooks:

# Example: Pre-commit 🪝 hook to run tests
nano .git/hooks/pre-commit

Add the following script:

#!/bin/sh
# Run 🧪 tests before committing
npm test

Make the 🪝 hook executable:

chmod +x .git/hooks/pre-commit

By mastering these 🌀 Git commands, you’ll be better equipped to handle the complexities of 🛠️ DevOps workflows, enabling seamless 👥 collaboration and effective 📂 source code management.