Re: What is the diff between a --soft and a blank reset

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 17/11/2024 08:54, A bughunter wrote:
My reply to Chris.

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?

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.

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.

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.

Telling someone that they need to learn English or get off the mailing list is completely unacceptable.

Best Wishes

Phillip






[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux