From: Kevin <ikke@ikke.info>
To: Arup Rakshit <aruprakshit@rocketmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: confusion with some `git reset` commands
Date: Thu, 18 Dec 2014 09:23:09 +0100 [thread overview]
Message-ID: <CAO54GHAVMSYCHAoqH1OOSaUeHBdSmqTvzJLWWUa0_bO3CLy4zg@mail.gmail.com> (raw)
In-Reply-To: <2055441.uOK6yH3IMG@linux-wzza.site>
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.
next prev parent reply other threads:[~2014-12-18 8:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-16 18:39 confusion with some `git reset` commands Arup Rakshit
2014-12-18 8:23 ` Kevin [this message]
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=CAO54GHAVMSYCHAoqH1OOSaUeHBdSmqTvzJLWWUa0_bO3CLy4zg@mail.gmail.com \
--to=ikke@ikke.info \
--cc=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).