Engineering
JobsGitHub
Search…
Welcome!
First Principles
Communication tools
Acronyms
Vital reading material
Engineering Onboarding
Onboarding Guide
Mobius onboarding Guide
Lessons
System design & Architecture
Introduction
Refactoring
Architecture Decision Records
Meetings
Iteration Planning Meetings
Daily Standup Meetings
Retro meetings (retrospective)
Release Engineering
Introduction
Git commit messages
Code reviews & pull requests
Trunk-based development
Service Dependencies
Tooling & infrastructure
Git commands & workflows
Project Management
Product Requirements Document
Pivotal Tracker
Powered By GitBook
Git commands & workflows
List of Git commands and workflows we generally use

Git commands and workflows

  • ​Rebase - Instead of creating a merge commit to merge a feature from a different branch, we "rebase and merge" the branch to keep a clean commit history. Please read more about how to use it here.
  • ​Cherry pick​
  • ​commit --amend - To change the last commit
  • push -f

Git GUI aid

Release Engineering - Previous
Tooling & infrastructure
Next - Project Management
Product Requirements Document
Last modified 2yr ago
Copy link
Contents
Git commands and workflows
Git GUI aid