Ramin Honary on Nostr: > "There's always the reflog, right?" npub1vd9ar…0yk94 in this case I pressed reset ...
> "There's always the reflog, right?"
npub1vd9arnpc0v2sgezy0pz626jfw77ute5ak66crmg7668lpe89c5wqg0yk94 (npub1vd9…yk94) in this case I pressed reset before adding things to the current commit so it was not in the reflog as the bug fixes had never been added to a commit, not even a staging commit. What Magit hard reset does is resets to the commit that you select, but first you choose if you want only one file, or if you want to reset all files. That is the difference between hard and soft reset.
It is something I do not very often, so I don't think I would get used to just pressing "yes" reflexively. The problem here was I didn't realize I had pressed X h instead of X f until after I selected the reset commit and all my changes suddenly dissapeared.
Published at
2023-11-14 11:43:50Event JSON
{
"id": "5cb7ef37a25995edd0c806175bac5f97571ea63869942948c1bb775455162913",
"pubkey": "4ae97b2084e2b2c3bc17385ca42179c75c9177c2fef6f0b99c65fa177ff4d1fa",
"created_at": 1699962230,
"kind": 1,
"tags": [
[
"p",
"634bd1cc387b150464447845a56a4977bdc5e69db6b581ed1ed68ff0e4e5c51c",
"wss://relay.mostr.pub"
],
[
"p",
"09133da57f371a4b16a99339f43ca1ce4bc0540a121475ddeaada4a6be77fdf3",
"wss://relay.mostr.pub"
],
[
"e",
"ab60d19c860a4323d3e8527793782df403547bc8e4f1f4c8bbaeed166114422a",
"wss://relay.mostr.pub",
"reply"
],
[
"proxy",
"https://emacs.ch/users/ramin_hal9001/statuses/111408724721662983",
"activitypub"
]
],
"content": "\u003e \"There's always the reflog, right?\"\nnostr:npub1vd9arnpc0v2sgezy0pz626jfw77ute5ak66crmg7668lpe89c5wqg0yk94 in this case I pressed reset before adding things to the current commit so it was not in the reflog as the bug fixes had never been added to a commit, not even a staging commit. What Magit hard reset does is resets to the commit that you select, but first you choose if you want only one file, or if you want to reset all files. That is the difference between hard and soft reset.\nIt is something I do not very often, so I don't think I would get used to just pressing \"yes\" reflexively. The problem here was I didn't realize I had pressed X h instead of X f until after I selected the reset commit and all my changes suddenly dissapeared.",
"sig": "6ab614ad3ceada9f753ae5506c6bc285f499aae20ce193b5f60e225c5cc787411ca678f2983a140dba2e818806b2e38038e2edb06bb0d3f504d1ce66e35d8770"
}