Engineering
  • Welcome!
  • First Principles
  • Communication tools
  • Acronyms
  • Vital reading material
  • Engineering Onboarding
    • Onboarding Guide
    • Mobius onboarding Guide
    • Lessons
      • 001 - Function Purity
      • WIP - Shared Mutable State
  • 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
      • Our methodology
    • Service Dependencies
    • Tooling & infrastructure
    • Git commands & workflows
  • Project Management
    • Product Requirements Document
    • Pivotal Tracker
Powered by GitBook
On this page
  • Git commands and workflows
  • Git GUI aid

Was this helpful?

  1. Release Engineering

Git commands & workflows

List of Git commands and workflows we generally use

PreviousTooling & infrastructureNextProduct Requirements Document

Last updated 4 years ago

Was this helpful?

Git commands and workflows

  • - 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 .

  • - To change the last commit

  • push -f

Git GUI aid

Rebase
here
Cherry pick
commit --amend
Android Studio/IntelliJ git UI
Gitkraken Git Client
SourceTree
Github Desktop