-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 My reply to Phillip, Chris, and ML. 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. Phillip, 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. The manpage terms the soft, mixed, and hard : modes. A mode of git-reset. 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. from A_bughunter@xxxxxxxxx Sent with Proton Mail secure email. On Sunday, November 17th, 2024 at 15:21, Phillip Wood <phillip.wood123@xxxxxxxxx> wrote: > On 17/11/2024 08:54, A bughunter wrote: > > > My reply to Chris. > Stopping 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. > Messages on this list are expected to be constructive and respectful to > others. I strongly recommend that you read the code of conduct [1] and > urge you to remember to be constructive and give others the benefit of > the doubt when posting here in the future. If you are using an LLM or > translation tool then I would suggest that you try a different one and > get someone to check your message before sending it. > > [1] https://github.com/git/git/blob/master/CODE_OF_CONDUCT.md > > > On Sunday, November 17th, 2024 at 02:57, Chris Torek chris.torek@xxxxxxxxx wrote: > > > > > * With `--mixed`, `git reset` adjusts `HEAD` as before -- > > > it's usually wisest to not have it adjust anything for > > > this case, in my opinion -- and then goes on to copy the > > > files from the `HEAD` commit into the index. > > > > I didn't give any case: What are you talking about? > > The 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: git reset [<mode>] [<commit>] This form resets the current branch head to <commit> and possibly updates the index (resetting it to the tree of <commit>) and the working tree depending on <mode>. Before the operation, ORIG_HEAD is set to the tip of the current branch. If <mode> is omitted, defaults to --mixed. The <mode> must be one of the following: > I think you have misunderstood what Chris was saying. My reading of this > is that he is taking about the general case of a user running "git reset > --mixed". > > > 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. > Spam 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. > Please remember that the person you are replying to is trying to help > and has given up their time to do so. I think that rather than copy and > pasting a manpage Chris has taken the time to write some bullet points > to try and explain the different reset modes. > > > 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. > I 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) > Whether you like it or not understanding terms like "the index" and > "HEAD" is necessary if you're going to be able to communicate clearly > with others about git. I cannot see any non-standard terminology in > Chris' reply. > > > 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.'" > > > "git status" lists the files that differ between the worktree and the > index as "Changes not staged for commit" and those that differ between > the index and HEAD as "Changes to be committed". As "git reset --soft" > changes HEAD but not the index then it may change the list of "Changes > to be committed" because HEAD has changed, but the content of those > files in the index is not changed. It will not change the list of > "Changes not staged for commit" because the index is unchanged. As "git > reset --mixed" changes both HEAD and the index then it may change both > lists show by "git status". > > > 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. > > I disagree: speaking and writing English is a prerequisite for communicating on any ML. > Telling someone that they need to learn English or get off the mailing > list is completely unacceptable. > > Best Wishes > > Phillip -----BEGIN PGP SIGNATURE----- Version: ProtonMail wnUEARYKACcFgmc6YPgJkKkWZTlQrvKZFiEEZlQIBcAycZ2lO9z2qRZlOVCu 8pkAAJmIAP4wl4TnJFVLNlfOdBwd42oilKLueb9+AP4UaYxJl98pZwD8C6+2 GVtF9HFuKdJpn1/rOUPO5sQ93vdr6x6YJQcKswU= =Mzyb -----END PGP SIGNATURE-----
Attachment:
publickey - A_bughunter@proton.me - 0x66540805.asc
Description: application/pgp-keys
Attachment:
publickey - A_bughunter@proton.me - 0x66540805.asc.sig
Description: PGP signature
