Thread (29 messages) flat view 29 messages, 16 authors, 2016-08-14

Re: [PATCH] cmd_reset: don't trash uncommitted changes unless told to

From: Jon Loeliger <hidden>
Date: 2016-06-15 22:44:50

Possibly related (same subject, not in this thread)

Andreas Ericsson wrote:
There is a "--hard" after one of them. It reads like this:

git reset --hard  ;# move current branch to random point in history
                  # discarding working tree and index state

git reset --mixed ;# move current branch to random point in history
                  # discard the index but keep the working tree

git reset --soft  ;# move current branch to random point in history,
                  # leaving index and working tree intact
I always thought that these would be best presented in
a linear ordering so that the effects were clearly
shown in an "increasing" way:

--soft
    - touches one thing

--mixed
    - touches one thing and a second
    - this is the default

--hard
    - touches one thing, a second and a third

Want a patch down that line?

jdl
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help