{"thread":{"id":"62505","subject":"What is the diff between a --soft and a blank reset","startedAt":"2024-11-17T02:07:52Z","lastAt":"2024-11-18T22:01:25Z","messageCount":9,"participants":["A bughunter","Chris Torek","Kristoffer Haugsbakk","Phillip Wood","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"507424","messageId":"myxdTw4K7jcrlKX-HC0edNKB3mgkjGJPAejkxWTcab03uT9uROZlO28zjhmnogOvGCJkag5q_Zvbok0VUyVjlkw5Goz3Gwe3l636lCYnGic=@proton.me","threadId":"62505","inReplyTo":null,"subject":"What is the diff between a --soft and a blank reset","fromName":"A bughunter","fromEmail":"a_bughunter@proton.me","sentAt":"2024-11-17T02:07:42Z","receivedAt":"2024-11-17T02:07:52Z","isPatch":false,"sender":{"key":"a_bughunter@proton.me","avatar":null},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA512\n\nWhat is the diff between a --soft and a blank which is --mixed reset? Does this from --soft: \"leaves all your changed files \"Changes to be committed\", as git status would put it.'\" mean soft leaves the adds indexed but before the adds were commit and without commit whereas --mixed would erase the index having adds ready to commit? This is how I gather it however the manpage hint's at being written by a thirdparty and having conflicting and scattered jargon makes it to where the user cannot communicate in a meaningful way about using the software. The difference here is touching the index but what does that mean in pragma: what does a git repo index handle? Isn't there some better way to find answers rather than Google advertisements or IRC wrong answers. See the snippet from the manpage below:\n\ngit reset [] []\n This form resets the current branch head to and possibly\n updates the index (resetting it to the tree of ) and the\n working tree depending on . Before the operation, ORIG_HEAD\n is set to the tip of the current branch. If is omitted,\n defaults to --mixed. The must be one of the following:\n\n --soft\n Does not touch the index file or the working tree at all (but\n resets the head to , just like all modes do). This\n leaves all your changed files \"Changes to be committed\", as\n git status would put it.\n\n --mixed\n Resets the index but not the working tree (i.e., the changed\n files are preserved but not marked for commit) and reports\n what has not been updated. This is the default action.\n\n If -N is specified, removed paths are marked as intent-to-add\n (see git-add(1)).\n\n\n\nfrom A_bughunter@proton.me\n\nSent with Proton Mail secure email.\n-----BEGIN PGP SIGNATURE-----\nVersion: ProtonMail\n\nwnUEARYKACcFgmc5T+sJkKkWZTlQrvKZFiEEZlQIBcAycZ2lO9z2qRZlOVCu\n8pkAAKvTAQCQIJGVcxvf7jSYvcPMUyeF15FriACM1QzPX2pyn++bxwEAxuK2\nc5qmTxALcRE4OKHk8UkP2S0gHqnos75thGKMwAI=\n=Ilx7\n-----END PGP SIGNATURE-----\n"},{"id":"507427","messageId":"CAPx1GvfT1iNnpJ0Jv0vhdHrwD-pDOK81MnUW2-Fk_zcJkW9PUQ@mail.gmail.com","threadId":"62505","inReplyTo":"myxdTw4K7jcrlKX-HC0edNKB3mgkjGJPAejkxWTcab03uT9uROZlO28zjhmnogOvGCJkag5q_Zvbok0VUyVjlkw5Goz3Gwe3l636lCYnGic=@proton.me","subject":"Re: What is the diff between a --soft and a blank reset","fromName":"Chris Torek","fromEmail":"chris.torek@gmail.com","sentAt":"2024-11-17T02:57:56Z","receivedAt":"2024-11-17T02:58:09Z","isPatch":false,"sender":{"key":"chris.torek@gmail.com","avatar":"https://avatars.githubusercontent.com/u/16826774?v=4"},"body":"On Sat, Nov 16, 2024 at 6:08 PM A bughunter wrote:\n> The difference here is touching the index but what does that mean in pragma ...\n\nUnderstanding \"the index\" is _crucial_ to using Git, yet it's not\noften explained very well.\n\n(Note: _emphasis_ means italics emphasis, while ALL CAPS means\nbold emphasis, below.)\n\nI think it helps to start with a simple fact about _every_ source\nmanagement system: such a system, by definition, _must_ have TWO\nCOPIES OF EVERY FILE available at all times. This follows from\nthe fact that you can get back the version you started with -- and\nto do that, the system must retain each original, unedited version\n-- and yet you must also be able to edit files, which means the\nsystem must retain the edited files as well. So those are the two\n_required_ copies: original, and edited. If the two are the same,\nit's at least theoretically possible to share them, but that's not\nimportant here. The actively-being-edited files are the _working\ntree_, while the frozen-for-all-time original files are saved\n(forever) in a Git commit, in the case of Git.\n\nWhat's unusual about Git is that it keeps a THIRD copy of every\nfile. As noted above, if any given pair of copies match, it's at\nleast theoretically possible to share them -- and Git sometimes\ndoes -- but that's not important here.\n\nWhat Git's index is all about is that it HOLDS THE THIRD COPY.\nThe reason this is crucial to know is that running:\n\n git commit\n\ntells Git to make a *new* commit FROM THIS THIRD COPY.\n\nThere are tricks you can use to attempt to hide or ignore this\nthird copy, but using them is, in my opinion, a bad idea, because\neventually one of these tricks fails and you're exposed to the\nfact that there _is_ a third copy. You might as well just get\nused to the idea.\n\nOnce you _are_ used to the idea, much of the rest of Git begins\nto make sense:\n\n * `git add` mainly copies files _into_ the index, preparing them\n for a future commit.\n\n * `git commit` takes whatever is in the index _right then_ and\n uses that to make the new (permanently-frozen) copy of all\n those files.\n\nNow, logically, `git reset` might be the one that undoes `git\nadd`. And it _does_ do that. The problem is that it does a\nlot more as well. It has, in fact, _three_ primary jobs:\n\n * It can move `HEAD`. (Understanding precisly what `HEAD` means,\n in Git, is another crucial item, but this message won't cover\n that.)\n\n * It can copy some or all files from a commit into the index.\n\n * Last, it can _also_ copy those files from the commit, into the\n index, and then on into the working tree.\n\n(Even more unfortunately, `git reset` has several auxiliary jobs\nas well as these three primary ones. I won't cover these.)\n\nThe three options -- `--soft`, `--mixed`, and `--hard` -- tell\n`git reset` which of these three jobs to do:\n\n * With `--soft`, `git reset` _only_ adjusts `HEAD`. The\n default adjustment is to leave it unchanged, so running\n `git reset --soft` with no additional arguments does\n nothing at all. That is, it does only job #1, then\n stops.\n\n * With `--mixed`, `git reset` adjusts `HEAD` as before --\n it's usually wisest to not have it adjust anything for\n this case, in my opinion -- and then goes on to copy the\n files from the `HEAD` commit into the index. That is, it\n does jobs #1 and #2, and then stops.\n\n * With `--hard`, `git reset` adjusts `HEAD`, copies the files\n from the adjusted `HEAD` to the index, and then copies the\n files from the index to the working tree. That is, it does\n all three of jobs #1, #2, and #3.\n\nAnd that's it: that's all you need to know. Well, _almost_ all:\nthere are all kinds of finicky corner cases around files that are\nin the working tree but _not_ in the index and/or commit. There's\nalso one other problem, in a new, totally-empty repository in\nwhich there are no commits yet. But those edge cases need a lot\nof explanation and should be left until later.\n\nChris\n"},{"id":"507428","messageId":"82f3cj_ASv_HNkdAe-1doxp6Vii0saBTB2wYbcwCEC3vDJpiwXvN6a6Agw7qNhKsGpBD8EbDC2u4VipTDJNr19nYcVV4BqV4GgNG9ysr5y4=@proton.me","threadId":"62505","inReplyTo":"CAPx1GvfT1iNnpJ0Jv0vhdHrwD-pDOK81MnUW2-Fk_zcJkW9PUQ@mail.gmail.com","subject":"Re: What is the diff between a --soft and a blank reset","fromName":"A bughunter","fromEmail":"a_bughunter@proton.me","sentAt":"2024-11-17T08:54:51Z","receivedAt":"2024-11-17T08:54:57Z","isPatch":false,"sender":{"key":"a_bughunter@proton.me","avatar":null},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA512\n\nMy reply to Chris.\n\nOn Sunday, November 17th, 2024 at 02:57, Chris Torek wrote:\n\n> * With `--mixed`, `git reset` adjusts `HEAD` as before --\n> it's usually wisest to not have it adjust anything for\n> this case, in my opinion -- and then goes on to copy the\n> files from the `HEAD` commit into the index. \n\nI didn't give any case: What are you talking about? It look's as though you are pasting a custom manpage for git-reset based on keyword matching. Essentially spamming the mailing list based on a keyword match. Yet another manpage being written by a thirdparty when having conflicting and scattered jargon makes it to where the user cannot communicate in a meaningful way about using the software. You vaguely show the difference (e.g. soft means job #1 and mixed means job #1 & #2) however not fully answering my pinpointed question \"Does this from --soft: \"leaves all your changed files \"Changes to be committed\", as git status would put it.'\" mean soft leaves the adds indexed but before the adds were commit and without commit whereas --mixed would erase the index having adds ready to commit?\" conscerning what the difference means in pragma. We and you need to learn English or get off of mailing lists: stop spamming. I say we because you are not alone.\n-----BEGIN PGP SIGNATURE-----\nVersion: ProtonMail\n\nwnUEARYKACcFgmc5r1gJkKkWZTlQrvKZFiEEZlQIBcAycZ2lO9z2qRZlOVCu\n8pkAAIesAQDkkFYk/snBkgshpusegy9iQB9bzbgPq0ErIwvIE0YYcAD+MGd5\nCb6hNTakaoa1GEM5/0kSLEqpuDWECaUefn8/ugU=\n=K4lg\n-----END PGP SIGNATURE-----\n"},{"id":"507438","messageId":"cb5090a3-59a8-44eb-ba68-3a8fac58c45e@app.fastmail.com","threadId":"62505","inReplyTo":"82f3cj_ASv_HNkdAe-1doxp6Vii0saBTB2wYbcwCEC3vDJpiwXvN6a6Agw7qNhKsGpBD8EbDC2u4VipTDJNr19nYcVV4BqV4GgNG9ysr5y4=@proton.me","subject":"Re: What is the diff between a --soft and a blank reset","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2024-11-17T12:59:09Z","receivedAt":"2024-11-17T12:59:30Z","isPatch":false,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"On Sun, Nov 17, 2024, at 09:54, A bughunter wrote:\n> -----BEGIN PGP SIGNED MESSAGE-----\n> Hash: SHA512\n>\n> My reply to Chris.\n>\n> On Sunday, November 17th, 2024 at 02:57, Chris Torek \n> wrote:\n>\n>> * With `--mixed`, `git reset` adjusts `HEAD` as before --\n>> it's usually wisest to not have it adjust anything for\n>> this case, in my opinion -- and then goes on to copy the\n>> files from the `HEAD` commit into the index. \n>\n> I didn't give any case: What are you talking about? It look's as though \n> you are pasting a custom manpage for git-reset based on keyword \n> matching. Essentially spamming the mailing list based on a keyword \n> match. Yet another manpage being written by a thirdparty when having \n> conflicting and scattered jargon makes it to where the user cannot \n> communicate in a meaningful way about using the software. You vaguely \n> show the difference (e.g. soft means job #1 and mixed means job #1 & \n> #2) however not fully answering my pinpointed question \"Does this from \n> --soft: \"leaves all your changed files \"Changes to be committed\", as \n> git status would put it.'\" mean soft leaves the adds indexed but before \n> the adds were commit and without commit whereas --mixed would erase the \n> index having adds ready to commit?\" conscerning what the difference \n> means in pragma. We and you need to learn English or get off of mailing \n> lists: stop spamming. I say we because you are not alone.\n\nDo you happen to use a translation program to write these emails? \n\n-- \nKristoffer Haugsbakk\n"},{"id":"507441","messageId":"5f401732-9b3d-4c45-88a8-a9e3d9d14fd9@gmail.com","threadId":"62505","inReplyTo":"82f3cj_ASv_HNkdAe-1doxp6Vii0saBTB2wYbcwCEC3vDJpiwXvN6a6Agw7qNhKsGpBD8EbDC2u4VipTDJNr19nYcVV4BqV4GgNG9ysr5y4=@proton.me","subject":"Re: What is the diff between a --soft and a blank reset","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2024-11-17T15:21:30Z","receivedAt":"2024-11-17T15:21:33Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 17/11/2024 08:54, A bughunter wrote:\n> My reply to Chris.\n\nMessages on this list are expected to be constructive and respectful to \nothers. I strongly recommend that you read the code of conduct [1] and \nurge you to remember to be constructive and give others the benefit of \nthe doubt when posting here in the future. If you are using an LLM or \ntranslation tool then I would suggest that you try a different one and \nget someone to check your message before sending it.\n\n[1] https://github.com/git/git/blob/master/CODE_OF_CONDUCT.md\n\n> On Sunday, November 17th, 2024 at 02:57, Chris Torek wrote:\n> \n>> * With `--mixed`, `git reset` adjusts `HEAD` as before --\n>> it's usually wisest to not have it adjust anything for\n>> this case, in my opinion -- and then goes on to copy the\n>> files from the `HEAD` commit into the index.\n> \n> I didn't give any case: What are you talking about?\n\nI think you have misunderstood what Chris was saying. My reading of this \nis that he is taking about the general case of a user running \"git reset \n--mixed\".\n\n> It look's as though you are pasting a custom manpage for git-reset\n > based on keyword matching. Essentially spamming the mailing list\n > based on a keyword match.\n\nPlease remember that the person you are replying to is trying to help \nand has given up their time to do so. I think that rather than copy and \npasting a manpage Chris has taken the time to write some bullet points \nto try and explain the different reset modes.\n\n > Yet another manpage being written by a thirdparty when having\n > conflicting and scattered jargon makes it to where the user cannot\n > communicate in a meaningful way about using the software.\n\nWhether you like it or not understanding terms like \"the index\" and \n\"HEAD\" is necessary if you're going to be able to communicate clearly \nwith others about git. I cannot see any non-standard terminology in \nChris' reply.\n\n > You vaguely show the difference (e.g. soft means job #1 and mixed\n > means job #1 & #2) however not fully answering my pinpointed question\n > \"Does this from --soft: \"leaves all your changed files \"Changes to be\n > committed\", as git status would put it.'\"\n\n\"git status\" lists the files that differ between the worktree and the \nindex as \"Changes not staged for commit\" and those that differ between \nthe index and HEAD as \"Changes to be committed\". As \"git reset --soft\" \nchanges HEAD but not the index then it may change the list of \"Changes \nto be committed\" because HEAD has changed, but the content of those \nfiles in the index is not changed. It will not change the list of \n\"Changes not staged for commit\" because the index is unchanged. As \"git \nreset --mixed\" changes both HEAD and the index then it may change both \nlists show by \"git status\".\n\n > mean soft leaves the adds indexed but\n > before the adds were commit and without commit whereas --mixed would\n > erase the index having adds ready to commit?\" conscerning what the\n > difference means in pragma. We and you need to learn English or get>\n > off of mailing lists: stop spamming. I say we because you are not\n > alone.\n\nTelling someone that they need to learn English or get off the mailing \nlist is completely unacceptable.\n\nBest Wishes\n\nPhillip\n\n\n"},{"id":"507446","messageId":"xDO5bMcFOIbJ5FhdpoxteVDBBjf5xXcVxQ5HboXdp-l_JojbIZ5gKERafNA0DdIFubVEupPQ3NqyoovEgsFJannL8A-9WqpzJIq-5sC0chI=@proton.me","threadId":"62505","inReplyTo":"5f401732-9b3d-4c45-88a8-a9e3d9d14fd9@gmail.com","subject":"Re: What is the diff between a --soft and a blank reset","fromName":"A bughunter","fromEmail":"a_bughunter@proton.me","sentAt":"2024-11-17T21:32:43Z","receivedAt":"2024-11-17T21:32:49Z","isPatch":false,"sender":{"key":"a_bughunter@proton.me","avatar":null},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA512\n\nMy reply to Phillip, Chris, and ML.\n\nMy pinpointed question \"Does this from --soft: \"leaves all your changed files \"Changes to be committed\", as git status would put it.'\" mean soft leaves the adds indexed but before the adds were commit and without commit whereas --mixed would erase the index having adds ready to commit?\" conscerning what the difference means in pragma.\n\nPhillip, I stated that my question is pinpointed. I will repaste the question above for the ML to focus on. I will admit that it is a complex sentence and complex problems may need to be described in complex ways. I used the word ADD this is the word the software uses to add (or track) the file. When talking about git software the terms git has applied to the actions of it are authoritive. An ADD is not the change itself but the tracking. \n The manpage terms the soft, mixed, and hard : modes. A mode of git-reset.\n Further the official Docs page uses this as a reference https://ndpsoftware.com/git-cheatsheet.html this visual should be accurate as it comes from the OFFICIAL source.\n\n\n\n\n\nfrom A_bughunter@proton.me\n\nSent with Proton Mail secure email.\n\nOn Sunday, November 17th, 2024 at 15:21, Phillip Wood wrote:\n\n> On 17/11/2024 08:54, A bughunter wrote:\n> \n> > My reply to Chris.\n> \n\nStopping spam is constructive. Usually with rule-books like that everybody else normatively violates higher points and then uses a lower point in the code to attack another or initiates a violation and then cites following defensive retorts (self-defence) to be violating while ignoring the agressive initiator. As such reading them is not worth my time: only a tease of what would be nice if you guys followed the code of conduct. \n> Messages on this list are expected to be constructive and respectful to\n> others. I strongly recommend that you read the code of conduct [1] and\n> urge you to remember to be constructive and give others the benefit of\n> the doubt when posting here in the future. If you are using an LLM or\n> translation tool then I would suggest that you try a different one and\n> get someone to check your message before sending it.\n> \n> [1] https://github.com/git/git/blob/master/CODE_OF_CONDUCT.md\n> \n> > On Sunday, November 17th, 2024 at 02:57, Chris Torek chris.torek@gmail.com wrote:\n> > \n> > > * With `--mixed`, `git reset` adjusts `HEAD` as before --\n> > > it's usually wisest to not have it adjust anything for\n> > > this case, in my opinion -- and then goes on to copy the\n> > > files from the `HEAD` commit into the index.\n> > \n> > I didn't give any case: What are you talking about?\n> \n> \nThe docs call this mode. Ask yourself: Why would you call it something else? Doing so creates confusion. Also if everything you say is written with ambiguity sure anybody can apply their own meanings. A snippet from the manpage showing \"modes\" from man git-reset follows:\n\ngit reset [] []\n This form resets the current branch head to and\n possibly updates the index (resetting it to the tree of\n ) and the working tree depending on .\n Before the operation, ORIG_HEAD is set to the tip of the\n current branch. If is omitted, defaults to --mixed. The must be one of the following:\n\n> I think you have misunderstood what Chris was saying. My reading of this\n> is that he is taking about the general case of a user running \"git reset\n> --mixed\".\n> \n> > It look's as though you are pasting a custom manpage for git-reset\n> \n> > based on keyword matching. Essentially spamming the mailing list\n> \n> > based on a keyword match.\n> \n\nSpam is not help. Taking the time to rephrase entire manpages when given a pinpointed question is spam. Or rephrasing introductory tutorials of which I already have not answering the question. I obviously already have the manpages and it does not explain, it is not clear therefore rephrasing it with lax words does nothing to help but only add's confusion: having conflicting and scattered jargon makes it to where the user cannot communicate in a meaningful way about using the software.\n> Please remember that the person you are replying to is trying to help\n> and has given up their time to do so. I think that rather than copy and\n> pasting a manpage Chris has taken the time to write some bullet points\n> to try and explain the different reset modes.\n> \n> > Yet another manpage being written by a thirdparty when having\n> \n> > conflicting and scattered jargon makes it to where the user cannot\n> \n> > communicate in a meaningful way about using the software.\n> \n\nI agree the terms must be grasped. In order to do so you must write competent English. You would be able to take a visual yet have all of the information in correct English. To the good credit of Chris he appears to have made a small step towards describing this visual ( https://ndpsoftware.com/git-cheatsheet.html ) in English. However what Chris did good is not enough to answer my question. (Or break the curse of what Chris admit's to be poor instruction)\n> Whether you like it or not understanding terms like \"the index\" and\n> \"HEAD\" is necessary if you're going to be able to communicate clearly\n> with others about git. I cannot see any non-standard terminology in\n> Chris' reply.\n> \n> > You vaguely show the difference (e.g. soft means job #1 and mixed\n> \n> > means job #1 & #2) however not fully answering my pinpointed question\n> \n> > \"Does this from --soft: \"leaves all your changed files \"Changes to be\n> \n> > committed\", as git status would put it.'\"\n> \n> \n> \"git status\" lists the files that differ between the worktree and the\n> index as \"Changes not staged for commit\" and those that differ between\n> the index and HEAD as \"Changes to be committed\". As \"git reset --soft\"\n> changes HEAD but not the index then it may change the list of \"Changes\n> to be committed\" because HEAD has changed, but the content of those\n> files in the index is not changed. It will not change the list of\n> \"Changes not staged for commit\" because the index is unchanged. As \"git\n> reset --mixed\" changes both HEAD and the index then it may change both\n> lists show by \"git status\".\n> \n> > mean soft leaves the adds indexed but\n> \n> > before the adds were commit and without commit whereas --mixed would\n> \n> > erase the index having adds ready to commit?\" conscerning what the\n> \n> > difference means in pragma. We and you need to learn English or get>\n> \n> > off of mailing lists: stop spamming. I say we because you are not\n> \n> > alone.\n> \n> \n\nI disagree: speaking and writing English is a prerequisite for communicating on any ML.\n> Telling someone that they need to learn English or get off the mailing\n> list is completely unacceptable.\n> \n> Best Wishes\n> \n> Phillip\n-----BEGIN PGP SIGNATURE-----\nVersion: ProtonMail\n\nwnUEARYKACcFgmc6YPgJkKkWZTlQrvKZFiEEZlQIBcAycZ2lO9z2qRZlOVCu\n8pkAAJmIAP4wl4TnJFVLNlfOdBwd42oilKLueb9+AP4UaYxJl98pZwD8C6+2\nGVtF9HFuKdJpn1/rOUPO5sQ93vdr6x6YJQcKswU=\n=Mzyb\n-----END PGP SIGNATURE-----\n"},{"id":"507447","messageId":"ueX70oc22vpdQxOCTXLLLRrsXFzeV5fHRPJ3upJiRrB3qcYY6BeKpUkzlod0cVvh1bMZUbhtyW6nthHVBsVBR2J_6jlWjQtIoGq_bGwUTwc=@proton.me","threadId":"62505","inReplyTo":"cb5090a3-59a8-44eb-ba68-3a8fac58c45e@app.fastmail.com","subject":"Re: What is the diff between a --soft and a blank reset","fromName":"A bughunter","fromEmail":"a_bughunter@proton.me","sentAt":"2024-11-17T22:23:12Z","receivedAt":"2024-11-17T22:23:31Z","isPatch":false,"sender":{"key":"a_bughunter@proton.me","avatar":null},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA512\n\nHapse not... Kristoffer, Hapse not. \n> Do you happen to use a translation program to write these emails?\n> \n> --\n> Kristoffer Haugsbakk\n-----BEGIN PGP SIGNATURE-----\nVersion: ProtonMail\n\nwnUEARYKACcFgmc6bM0JkKkWZTlQrvKZFiEEZlQIBcAycZ2lO9z2qRZlOVCu\n8pkAAD0kAQCv7OoWzB10BoXhMGu/mnwI4uq6FUALZX5AHC1eazm/XgD+IO8T\nsHHN0Og2R5fHrryn7g1tjyRgRU8BVXMlja2kwgU=\n=00gR\n-----END PGP SIGNATURE-----\n"},{"id":"507450","messageId":"xmqqr079xty7.fsf@gitster.g","threadId":"62505","inReplyTo":"5f401732-9b3d-4c45-88a8-a9e3d9d14fd9@gmail.com","subject":"Re: What is the diff between a --soft and a blank reset","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-11-18T00:32:32Z","receivedAt":"2024-11-18T00:32:35Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phillip Wood writes:\n\n> Messages on this list are expected to be constructive and respectful\n> to others. I strongly recommend that you read the code of conduct [1]\n> and urge you to remember to be constructive and give others the\n> benefit of the doubt when posting here in the future.\n> ...\n>\n> [1] https://github.com/git/git/blob/master/CODE_OF_CONDUCT.md\n> ...\n> Please remember that the person you are replying to is trying to help\n> and has given up their time to do so. I think that rather than copy\n> and pasting a manpage Chris has taken the time to write some bullet\n> points to try and explain the different reset modes.\n> ...\n> Telling someone that they need to learn English or get off the mailing\n> list is completely unacceptable.\n\nThanks, I have not much to add.\n\nThe code-of-conduct does make it acceptable to tell those who\ndeviate from acceptable behavior on the list to get off the list, by\nthe way. I cannot yet say with 100% confidence if it is merely\nmisunderstanding due to language barrier, or somebody is trolling\nothers, deliberately, but perhaps we a few exchanges, we may know.\n\n"},{"id":"507537","messageId":"ejBRJUb9pBCpQnS2xiYI7INamzAQNqx8U-FbjQ2FXQiNAZZne7U-iIj8Hmhb3Dc3PK3I_nlD-vNOMLdhUOui9nZFX3zMVuSKbnObj0cP6EA=@proton.me","threadId":"62505","inReplyTo":"xmqqr079xty7.fsf@gitster.g","subject":"Re: What is the diff between a --soft and a blank reset","fromName":"A bughunter","fromEmail":"a_bughunter@proton.me","sentAt":"2024-11-18T22:01:21Z","receivedAt":"2024-11-18T22:01:25Z","isPatch":false,"sender":{"key":"a_bughunter@proton.me","avatar":null},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA512\n\nBROAD OVERVIEW\n\nbugreport[A], question[B] and use-case[C]. These are all related but separate threads for the purposes as labled. Please do not cross-post or cross-quote. Focus on productivity and solving these. You are welcomed to view and participate in all of these as I contribute more.\n\nuse-case[C] - git question (short) rephrase with use-case added.\n\nADD, ADD, ADD why cant they get that: ADD. ADD tracks files for commit. It's already been commit : push failed. Failed pushes piled up. I need them untracked. How do you undo an add ( many adds): simple question. Without deleting any files, to repush 1 by 1.\n\nI suspect the answer is: \"you can't - git provides no means to do so\" - a defect, bug as we call it. The answer to this use-case question likely will confirm my bugreport and I get the feeling this is why they will not answer the question they do not want to accept my bugreport and have a bad spirit to argue. The excuses they give for this will be that it is not typical: This can normally be solved by repushing. However it is still a defect and in my use-case there is a slow or intermittent connection and no sha-backups yet because this is the initial creation of a repo. \n\nThe above question is a use-case[C] seeking how to undo without deleting files. There shouldn't be any need to know a use-case in order to answer a technical question. I am open to discuss my use-case on this thread. The use-case if of this repo github.com/freedom-foundation/kjbible\n\nMy original bug report is that the user \" may be cornered into delete files\" bugreport[A] Summary as of 20241117 brian does not believe it's a bug and begins chattering to Peff about how to fix the bug \"There are Git-level keepalives during the similar compression operation\".\n\nThe full question[B] which is a child of the bugreport[A] is here. Summary as of 20241117 my question was mostly sidestepped and spammed whilst the thread devolved into a political drama about code_of_conduct. I am not open to discuss my use-case on this thread.\n\n\n[A]: https://lore.kernel.org/git/20241115093214.GA1749331@coredump.intra.peff.net/#r\n\n[B]: https://lore.kernel.org/git/xmqqr079xty7.fsf@gitster.g/T/#t\n\n[C]: https://lore.kernel.org/all/4hiTc8Kx5yNhYuN8abv3QFJBuptM6VWZ9OKvkdZFlSI5y0zoK-lN_VHf-QCSEjllmSWvu9V-tbrvFOx17_P0Nq8UKxEcK3Rs2d02FjbYuUc=@proton.me/#r\n-----BEGIN PGP SIGNATURE-----\nVersion: ProtonMail\n\nwnUEARYKACcFgmc7uS4JkKkWZTlQrvKZFiEEZlQIBcAycZ2lO9z2qRZlOVCu\n8pkAAKUDAQDf3cixv7dXR8M2wfPRVZBTenFZFOweS6hWNnv4RkLrQAEA1QZI\nvpNUKP7SN+J1de9kuQ4zHHjDuksnTflDPeOQpQE=\n=Yn2L\n-----END PGP SIGNATURE-----\n"}]}