Home About Projects Feedback Devlog Notes Contact
Home About Projects Feedback Devlog Notes Contact
Aamnah working

Hi, I am Aamnah!

I build amazing user experiences and tinker with all things web

Say hi
Notes

Rebasing vs. Merging

Edit on GitHub
Jan 12, 2017
Git & Github

Cheatsheet

Rebasing vs. Merging

Merging combine branches, you go to different paths and join back in the main road. Rebasing adds branches on top of other branches. You go to a different path, and then come back and add the whole path on top of the main road.

Rebasing is neat, but you kinda lose the original commit authors.

Tools

  • Git Kraken - Mac, Windows, Linux
  • Smart Git - Mac, Windows, Linxu

Links

  • YouTube: Git Tutorial: Rebasing & Merging
Recent Posts
  • Install VNC server on Armbian
  • Create a sublime text snippet to insert a slug
  • Load Go modules from private repos
  • Add author profiles to blog posts on Hugo websites
  • Load content from a github repo for a hugo website as a module
  • Hugo assets directory
Popular Tags
linux (16) bash (11) es2015 (11) mysql (11) how-to (10) array methods (9) commands (9) concepts (8) cheatsheet (7) sass (7) free (6) ssh (6) compass (5) fastlane (5) python (5) backups (4) database (4) editor (4) netlify (4) opencart (4)
Browse all topics
Algorithms Amazon Web Services (AWS) Android APIs Armbian Bash Scripting C# Cheatsheets Commands CSS & Sass Databases DevOps Docker DRAFTS Expo Fastlane Firebase Flutter Gatsby Git & Github Go GraphQL Hardware Hugo iOS JavaScript Jekyll JS Interview Prep Linux Load Go modules from private repos macOS Misc. Node Node API OpenCart Personal PHP Programming Python Raspberry Pi React Native & Expo ReactJS Redux Serverless System Administration Typescript Ubuntu Web Development WordPress Workflow

Please note that this site and the posts on it are, and will always be, a work in progress.
If i waited for perfection, i'd never get anything done.

Powered by Hugo and Netlify .
Made by Aamnah with and magic!
RSS