Nerd Posts

OMFG GIT REBASE

Situation:

[origin/branch1]  [branch1]  some commit message
[origin/branch2]  [branch2]  another commit message

git checkout branch1
git rebase branch2

oops...

[origin/branch1]  some commit message
[origin/branch2]  [branch2]  [branch1]   another commit message

to undo this:

git checkout branch1
git fetch origin
git reset --hard origin/branch1


Posted by Dev Culture

No comments:

Post a Comment

Newer Post Older Post Home
Subscribe to: Post Comments (Atom)

Contributors

  • Danny Yu
  • Dev Culture

Links

Resume
LinkedIn

Blog Archive

  • ►  2017 (4)
    • ►  February (4)
  • ►  2016 (1)
    • ►  June (1)
  • ▼  2015 (9)
    • ▼  December (6)
      • Using query to alter sysmail servername in SQL SER...
      • GIT checkout from tag
      • GIT diff branches, apply diff
      • GIT rebase
      • GIT force take branch changes
      • OMFG GIT REBASE
    • ►  January (3)
  • ►  2014 (18)
    • ►  December (7)
    • ►  October (6)
    • ►  September (5)
  • ►  2013 (1)
    • ►  February (1)
  • ►  2011 (10)
    • ►  July (1)
    • ►  May (2)
    • ►  April (6)
    • ►  March (1)
  • ►  2010 (27)
    • ►  December (2)
    • ►  November (2)
    • ►  October (4)
    • ►  September (1)
    • ►  July (1)
    • ►  June (2)
    • ►  May (6)
    • ►  April (3)
    • ►  March (2)
    • ►  February (4)
  • ►  2009 (52)
    • ►  December (5)
    • ►  November (19)
    • ►  October (3)
    • ►  September (1)
    • ►  August (7)
    • ►  July (4)
    • ►  June (2)
    • ►  May (2)
    • ►  April (3)
    • ►  March (1)
    • ►  February (1)
    • ►  January (4)
  • ►  2008 (76)
    • ►  December (9)
    • ►  November (3)
    • ►  October (64)
Simple theme. Powered by Blogger.