Timeline for How can I reconcile detached HEAD with master/origin?
Current License: CC BY-SA 3.0
13 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Aug 28, 2021 at 8:19 | comment | added | mvds |
This is very nice and does exactly what I need for my workflow, but actually a little different from what I think is described here under point 3: it plays the commits between the divergence point and master on top of the detached HEAD. In other words, the commits naively done on the detached HEAD are exactly where I intended them to be, namely somewhere in history and not on top of master. I would normally use interactive rebase for this. Side note: git rebase master HEAD does the opposite and plays the commits on the detached HEAD on top of master, as described in this answer.
|
|
| Jun 6, 2020 at 13:41 | comment | added | Dmitry Minkovsky |
Yikes. Sorry to hear that. Consider finding the commit your want to reset your branch to using git reflog then reset your branch to that commit with git rest —hard $commit
|
|
| Jun 6, 2020 at 13:39 | comment | added | Sentry.co | this suggestion created all sorts of parallel universes FML | |
| Sep 27, 2017 at 21:38 | history | edited | Dmitry Minkovsky | CC BY-SA 3.0 |
added 74 characters in body
|
| Sep 23, 2017 at 16:53 | history | edited | Dmitry Minkovsky | CC BY-SA 3.0 |
added 18 characters in body
|
| Sep 9, 2017 at 21:46 | history | edited | Dmitry Minkovsky | CC BY-SA 3.0 |
added 102 characters in body
|
| Sep 8, 2017 at 18:15 | history | edited | Dmitry Minkovsky | CC BY-SA 3.0 |
deleted 4 characters in body; deleted 154 characters in body
|
| Sep 8, 2017 at 14:18 | history | edited | Dmitry Minkovsky | CC BY-SA 3.0 |
deleted 228 characters in body
|
| Sep 8, 2017 at 14:12 | history | edited | Dmitry Minkovsky | CC BY-SA 3.0 |
deleted 228 characters in body
|
| Sep 10, 2015 at 22:37 | comment | added | Benjamin | git: "First, rewinding head to replay your work on top of it... Fast-forwarded master to HEAD." me: "nice!" | |
| Aug 20, 2013 at 13:48 | history | edited | Dmitry Minkovsky | CC BY-SA 3.0 |
deleted 2 characters in body
|
| Aug 2, 2013 at 3:15 | history | edited | Dmitry Minkovsky | CC BY-SA 3.0 |
added 117 characters in body
|
| Aug 2, 2013 at 3:10 | history | answered | Dmitry Minkovsky | CC BY-SA 3.0 |