Skip to content
  • Home
  • About
  • No Access
  • Privacy Policy
Bits of .NET
Bits of .NET
  • Asp.Net Core
  • C#
  • SQL
  • JavaScript
  • CSS
  • About
  • ErcanOPAK.com
  • No Access
  • Privacy Policy

Bits of .NET

Daily micro-tips for C#, SQL, performance, and scalable backend engineering.

  • Asp.Net Core
  • C#
  • SQL
  • JavaScript
  • CSS
  • About
  • ErcanOPAK.com
  • No Access
  • Privacy Policy
Git

Git: Use Rebase for Clean Commit History

- 07.07.26 - ErcanOPAK

🧹 Rebase = Clean History

Merge commits are messy. Rebase creates clean history. Linear, readable, professional.

❌ Merge (Messy)

* Merge commit
|\
| * Feature commit
| * Feature commit
| * Feature commit
* | Main commit
* | Main commit

✅ Rebase (Clean)

* Feature commit
* Feature commit
* Feature commit
* Main commit
* Main commit

📝 Rebase Commands

# Basic rebase
git checkout feature-branch
git rebase main

# Interactive rebase (squash commits)
git rebase -i HEAD~5

# Rebase with options
git rebase --abort  # Cancel rebase
git rebase --continue # Continue after conflict resolution
git rebase --skip # Skip current commit

# Rebase onto
git rebase --onto target-branch source-branch feature-branch

# Rebase with merge strategy
git rebase -X theirs main # Resolve using theirs
git rebase -X ours main   # Resolve using ours

🎯 Interactive Rebase

# Interactive rebase - squash commits
git rebase -i HEAD~5

# In editor:
pick a1b2c3d Fix bug
pick e4f5g6h Update tests
pick i7j8k9l Add feature
pick m0n1o2p Code review changes
pick p3q4r5s Final fixes

# Change to:
pick a1b2c3d Fix bug
squash e4f5g6h Update tests
squash i7j8k9l Add feature
squash m0n1o2p Code review changes
squash p3q4r5s Final fixes

# Result: One commit with all changes

# Rebase options:
pick - Use commit
reword - Change message
edit - Amend commit
squash - Combine with previous
fixup - Combine, discard message
exec - Run command
drop - Remove commit

💡 Rebase Best Practices

  • Don’t rebase shared branches
  • Rebase before merging to main
  • Use interactive rebase for cleanup
  • Squash related commits
  • Write clear commit messages

“Rebase creates clean history. Linear, readable, professional. Essential for Git workflow.”

— Git Expert

Related posts:

Git: Fix git worktree add Checking Out a Branch That Silently Diverges From the Same Branch in the M...

Git: Fix git worktree add Checking Out a Branch That Silently Diverges From the Same Branch in the M...

Why git pull Is Dangerous (And What to Use Instead)

Why git pull Is Dangerous (And What to Use Instead)

Git: Use Git Hooks to Automate Tasks on Commit, Push, Merge

Git: Use Git Hooks to Automate Tasks on Commit, Push, Merge

Views: 13

Post navigation

Ajax: Master Error Handling in Async Requests
.NET Core: Use Entity Framework Core for Database Access

Leave a Reply Cancel reply

Your email address will not be published. Required fields are marked *

November 2026
M T W T F S S
 1
2345678
9101112131415
16171819202122
23242526272829
30  
« Oct    

Most Viewed Posts

  • How to make theater mode the default for Youtube (1,068)
  • Get the User Name and Domain Name from an Email Address in SQL (990)
  • How to add default value for Entity Framework migrations for DateTime and Bool (986)
  • Get the First and Last Word from a String or Sentence in SQL (865)
  • How to select distinct rows in a datatable in C# (859)
  • How to enable, disable and check if Service Broker is enabled on a database in SQL Server (661)
  • Add Constraint to SQL Table to ensure email contains @ (619)
  • Average of all values in a column that are not zero in SQL (577)
  • How to use Map Mode for Vertical Scroll Mode in Visual Studio (553)
  • Find numbers with more than two decimal places in SQL (481)

Recent Posts

  • Network Speed Monitor Windows Application v2.5.1
  • Ağ Hızı İzleyici Windows Uygulaması v2.5.1
  • How to make theater mode the default for Youtube
  • The AI Prompt That Audits a Function for Thread-Safety Gaps
  • Ajax: Fix a Fetch Request Caching a Response Despite No-Store
  • WordPress: Fix a Navigation Block Losing Submenu Items After Sync
  • Visual Studio: Fix CodeLens Reference Counts Stuck at Stale Numbers
  • C#: Fix a UTF-8 String Literal Behaving Differently in a Switch
  • Photoshop: Fix a Liquify Mesh Snapping Back on a Smart Object
  • The AI Prompt That Turns a Crash Dump Into a Short Repro Script

Most Viewed Posts

  • How to make theater mode the default for Youtube (1,068)
  • Get the User Name and Domain Name from an Email Address in SQL (990)
  • How to add default value for Entity Framework migrations for DateTime and Bool (986)
  • Get the First and Last Word from a String or Sentence in SQL (865)
  • How to select distinct rows in a datatable in C# (859)

Recent Posts

  • Network Speed Monitor Windows Application v2.5.1
  • Ağ Hızı İzleyici Windows Uygulaması v2.5.1
  • How to make theater mode the default for Youtube
  • The AI Prompt That Audits a Function for Thread-Safety Gaps
  • Ajax: Fix a Fetch Request Caching a Response Despite No-Store

Social

  • ErcanOPAK.com
  • GoodReads
  • LetterBoxD
  • Linkedin
  • The Blog
  • Twitter
© 2026 Bits of .NET | Built with Xblog Plus free WordPress theme by wpthemespace.com