Re: confusion with some `git reset` commands

2014-12-18 Thread Konstantin Khomoutov
On Wed, 17 Dec 2014 01:09:08 +0630 Arup Rakshit 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 -- To unsubscribe from

Re: confusion with some `git reset` commands

2014-12-18 Thread Christian Couder
> On Tue, Dec 16, 2014 at 7:39 PM, Arup Rakshit > 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 min

Re: confusion with some `git reset` commands

2014-12-18 Thread Kevin
On Tue, Dec 16, 2014 at 7:39 PM, Arup Rakshit 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 chang