public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
* What is the diff between a --soft and a blank reset
@ 2024-11-17  2:07 A bughunter
  2024-11-17  2:57 ` Chris Torek
  0 siblings, 1 reply; 9+ messages in thread
From: A bughunter @ 2024-11-17  2:07 UTC (permalink / raw)
  To: git@vger•kernel.org

[-- Attachment #1: Type: text/plain, Size: 2254 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

What 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:

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:

           --soft
               Does not touch the index file or the working tree at all (but
               resets the head to <commit>, just like all modes do). This
               leaves all your changed files "Changes to be committed", as
               git status would put it.

           --mixed
               Resets the index but not the working tree (i.e., the changed
               files are preserved but not marked for commit) and reports
               what has not been updated. This is the default action.

               If -N is specified, removed paths are marked as intent-to-add
               (see git-add(1)).



from A_bughunter@proton•me

Sent with Proton Mail secure email.
-----BEGIN PGP SIGNATURE-----
Version: ProtonMail

wnUEARYKACcFgmc5T+sJkKkWZTlQrvKZFiEEZlQIBcAycZ2lO9z2qRZlOVCu
8pkAAKvTAQCQIJGVcxvf7jSYvcPMUyeF15FriACM1QzPX2pyn++bxwEAxuK2
c5qmTxALcRE4OKHk8UkP2S0gHqnos75thGKMwAI=
=Ilx7
-----END PGP SIGNATURE-----

[-- Attachment #2: publickey - A_bughunter@proton.me - 0x66540805.asc --]
[-- Type: application/pgp-keys, Size: 653 bytes --]

[-- Attachment #3: publickey - A_bughunter@proton.me - 0x66540805.asc.sig --]
[-- Type: application/pgp-signature, Size: 118 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2024-11-18 22:01 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-17  2:07 What is the diff between a --soft and a blank reset A bughunter
2024-11-17  2:57 ` Chris Torek
2024-11-17  8:54   ` A bughunter
2024-11-17 12:59     ` Kristoffer Haugsbakk
2024-11-17 22:23       ` A bughunter
2024-11-17 15:21     ` Phillip Wood
2024-11-17 21:32       ` A bughunter
2024-11-18  0:32       ` Junio C Hamano
2024-11-18 22:01         ` A bughunter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox