confusion with some `git reset` commands

confusion with some `git reset` commands

[Arup Rakshit]

Hi,

>From the command help I see - 

[arup@to_do_app]$ git reset -h
usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] 
[<commit>]
   or: git reset [-q] <tree-ish> [--] <paths>...
   or: git reset --patch [<tree-ish>] [--] [<paths>...]

    -q, --quiet           be quiet, only report errors
    --mixed               reset HEAD and index
    --soft                reset only HEAD
    --hard                reset HEAD, index and working tree
    --merge               reset HEAD, index and working tree
    --keep                reset HEAD but keep local changes
    -p, --patch           select hunks interactively

But I am looking for any differences -

a) git reset --soft and git reset --keep
b) git reset --hard and git reset --merge


-- 
================
Regards,
Arup Rakshit
================
Debugging is twice as hard as writing the code in the first place. Therefore, 
if you write the code as cleverly as possible, you are, by definition, not 
smart enough to debug it.

--Brian Kernighan

Re: confusion with some `git reset` commands

[Kevin]

On Tue, Dec 16, 2014 at 7:39 PM, Arup Rakshit
<aruprakshit@rocketmail.com> wrote:
> Hi,
> ..
>
> But I am looking for any differences -
>
> a) git reset --soft and git reset --keep

git reset --keep is a safer version of git reset --hard. It will reset
the working tree. but will abort when it has to overwrite uncomitted
changes.

> b) git reset --hard and git reset --merge

git reset --merge does the same as hard, but keeps unstaged changes.
When unstaged changes would need to be overwritted, it also aborts.

Re: confusion with some `git reset` commands

[Christian Couder]

> On Tue, Dec 16, 2014 at 7:39 PM, Arup Rakshit
> <aruprakshit@rocketmail.com> wrote:

>> From the command help I see -
>>
>> [arup@to_do_app]$ git reset -h

You can also use "git help reset" to have the full man page.
It has a lot more information.

>> But I am looking for any differences -

Do you have some use cases in mind?

Best,
Christian.

Re: confusion with some `git reset` commands

[Konstantin Khomoutov]

On Wed, 17 Dec 2014 01:09:08 +0630
Arup Rakshit <aruprakshit@rocketmail.com> wrote:

[...]
> But I am looking for any differences -
> 
> a) git reset --soft and git reset --keep
> b) git reset --hard and git reset --merge

Please consider reading
http://git-scm.com/book/en/v2/Git-Tools-Reset-Demystified