git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
KHKristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date
Nov 17, 2024, 12:59 UTC
Message-ID
<cb5090a3-59a8-44eb-ba68-3a8fac58c45e@app.fastmail.com>
In-Reply-To
<82f3cj_ASv_HNkdAe-1doxp6Vii0saBTB2wYbcwCEC3vDJpiwXvN6a6Agw7qNhKsGpBD8EbDC2u4VipTDJNr19nYcVV4BqV4GgNG9ysr5y4=@proton.me>
On Sun, Nov 17, 2024, at 09:54, A bughunter wrote:
Show 27 quoted lines
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA512
>
> My reply to Chris.
>
> On Sunday, November 17th, 2024 at 02:57, Chris Torek 
> <chris.torek@gmail.com> 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? 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.
Do you happen to use a translation program to write these emails? 
-- 
Kristoffer Haugsbakk
Previous: A bughunterNext: A bughunter
Message 4 of 9 in “What is the diff between a --soft and a blank reset”
  1. A bughunterNov 17, 2024
  2. Chris TorekNov 17, 2024
  3. A bughunterNov 17, 2024
  4. Kristoffer HaugsbakkNov 17, 2024
  5. A bughunterNov 17, 2024
  6. Phillip WoodNov 17, 2024
  7. A bughunterNov 17, 2024
  8. Junio C HamanoNov 18, 2024
  9. A bughunterNov 18, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.