git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arup Rakshit <aruprakshit@rocketmail.com>
To: git@vger.kernel.org
Subject: confusion with some `git reset` commands
Date: Wed, 17 Dec 2014 01:09:08 +0630	[thread overview]
Message-ID: <2055441.uOK6yH3IMG@linux-wzza.site> (raw)

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

             reply	other threads:[~2014-12-16 19:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-16 18:39 Arup Rakshit [this message]
2014-12-18  8:23 ` confusion with some `git reset` commands Kevin
2014-12-18  8:38   ` Christian Couder
2014-12-18 12:09 ` Konstantin Khomoutov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2055441.uOK6yH3IMG@linux-wzza.site \
    --to=aruprakshit@rocketmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).