From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yotam Gingold Subject: Re: Git reset --hard with staged changes Date: Mon, 23 May 2016 00:55:55 +0000 (UTC) Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: base64 To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon May 23 03:00:17 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1b4eEC-0007DS-7D for gcvg-git-2@plane.gmane.org; Mon, 23 May 2016 03:00:16 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752726AbcEWBAJ (ORCPT ); Sun, 22 May 2016 21:00:09 -0400 Received: from plane.gmane.org ([80.91.229.3]:55677 "EHLO plane.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752706AbcEWBAI (ORCPT ); Sun, 22 May 2016 21:00:08 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1b4eE1-00075m-4M for git@vger.kernel.org; Mon, 23 May 2016 03:00:05 +0200 Received: from c-73-200-28-96.hsd1.dc.comcast.net ([73.200.28.96]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 23 May 2016 03:00:05 +0200 Received: from yotam by c-73-200-28-96.hsd1.dc.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 23 May 2016 03:00:05 +0200 X-Injected-Via-Gmane: http://gmane.org/ X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: sea.gmane.org User-Agent: Loom/3.14 (http://gmane.org/) X-Loom-IP: 73.200.28.96 (Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_4) AppleWebKit/601.5.17 (KHTML, like Gecko) Version/9.1 Safari/601.5.17) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: UGllcnJlLUZyYW7Dp29pcyBDTEVNRU5UIDxsaWtleW4gPGF0PiBnbWFpbC5jb20+IHdyaXRlczoKPiAyMDE0LTA2LTEwIDE3OjI3IEdNVCswMjowMCBEYXZpZCBLYXN0cnVwIDxkYWsgPGF0PiBnbnUub3JnPjoKPj4gUGllcnJlLUZyYW7Dp29pcyBDTEVNRU5UIDxsaWtleW4gPGF0PiBnbWFpbC5jb20+IHdyaXRlczoKPj4KPj4+IC4uLgo+Pj4KPj4+IEhtIEkgc2VlLiBFdmVuIHRob3VnaCB0aGUgZG9jdW1lbnRhdGlvbiBkb2Vzbid0IG1ha2UgaXQgdmVyeSBjbGVhcgo+Pj4gYWJvdXQgd2hhdCBoYXBwZW5zIHRvIHN1Y2ggZmlsZXMsIGl0IHR1cm5zIG91dCB0aGUgc2NlbmFyaW8gd2UKPj4+IHN0dW1ibGVkIHVwb24gc2VlbXMgdG8gYmUgdGhlIHNwZWNpYWwgdXNlIGNhc2UgYWZ0ZXIgYWxsLiBUaGFua3MgZm9yCj4+PiBzaGVkZGluZyBzb21lIGxpZ2h0IG9uIHRoaXMgOikgSSB3b25kZXIgd2h5IGRvZXMgZ2l0LXJlc2V0J3MgaGFyZCBtb2RlCj4+PiBub3QgYWx3YXlzIHJlbW92ZSB1bnRyYWNrZWQgZmlsZXMgdGhlbj8KPj4KPj4gQmVjYXVzZSBpdCBuZXZlciByZW1vdmVzIHRoZW0/ICBHaXQgb25seSByZW1vdmVzIGZpbGVzIG9uY2UgaXQgdHJhY2tz Cj4+IHRoZW0uICBUaGlzIGluY2x1ZGVzIHRoZSBvcGVyYXRpb24gb2YgcmVtb3ZpbmcgX2FuZF8gdW50cmFja2luZyB0aGVtLAo+PiBsaWtlIHdpdGggZ2l0IHJlc2V0IC0taGFyZC4KPj4KPj4gVGhlIG9ubHkgY29tbWFuZCB3aGljaCBleHBsaWNpdGx5IG1lc3NlcyB3aXRoIHVudHJhY2tlZCBmaWxlcyBpcwo+PiBnaXQtY2xlYW4uCj4+Cj4+IC0tCj4+IERhdmlkIEthc3RydXAKPiAKPiAuLi4gSSBjb3VsZG4ndCBmaW5kIGEgZGVmaW5pdGlvbiB0aGF0IGJhY2tzIHRoaXMgaW4gdGhlIG1hbgo+IHBhZ2VzIChtYXliZSB0aGUgZ2l0LWdsb3NzYXJ5IHdvdWxkIGJlIGEgZ29vZCBwbGFjZSBmb3IgaXQ/KSwgYW5kIHRoZQo+IG9uZSBmcm9tIHRoZSBHaXQtU2NtIGJvb2sgb25seSBjb25mdXNlZCBtZSBpbiB0aGlua2luZyB0aGUgb3Bwb3NpdGUuCj4gVGhhbmtzIGZvciB0aGUgY2xhcmlmaWNhdGlvbgo+IAo+IC0tCj4gUGllcnJlLUZyYW7Dp29pcyBDTEVNRU5UCj4gQXBwbGljYXRpb24gZGV2ZWxvcGVyIGF0IFVwY2FzdCBTb2NpYWwKCkp1bXBpbmcgaW50byB0aGlzIGNvbnZlcnNhdGlvbiB0d28geWVhcnMgbGF0ZXIqLiBUaGVyZSdzIGNvbmZ1c2lvbi BhYm91dCB3aGF0CmNvbnN0aXR1dGVzIGEgdHJhY2tlZCBmaWxlIGZvciBnaXQgcmVzZXQgLS1oYXJkLCBhbmQgZ29vZCByZWFzb25zIGZvciBnaXQgcmVzZXQKLS1oYXJkJ3MgYmVoYXZpb3IuIE5ldmVydGhlbGVzcywgSSB0aGluayB3ZSBjYW4gYWxsIGFncmVlIHRoYXQgdGhlIG1hbiBwYWdlCmVudHJ5IGZvciBnaXQgcmVzZXQgLS1oYXJkIGlzIHdvZWZ1bGx5IGRlZmljaWVudDoKCi0taGFyZCBSZXNldHMgdGhlIGluZGV4IGFuZCB3b3JraW5nIHRyZWUuIEFueSBjaGFuZ2VzIHRvIHRyYWNrZWQgZmlsZXMgaW4gdGhlCndvcmtpbmcgdHJlZSBzaW5jZSA8Y29tbWl0PiBhcmUgZGlzY2FyZGVkLgoKVGhpcyBzaG91bGQgYmUgY2xhcmlmaWVkIHRvIGRlZmluZSB3aGF0IGEgdHJhY2tlZCBmaWxlIGlzLiBJIHByb3Bvc2UgYXBwZW5kaW5nOgoKICAgIEEgZmlsZSBpcyBjb25zaWRlcmVkIHRyYWNrZWQgaWYgaXQgZXhpc3RzIGluIGEgcHJpb3IgY29tbWl0IG9yIGluIHRoZQogICAgc3RhZ2luZyBhcmVhLiBOb3RlIHRoYXQgYSBuZXdseSBhZGRlZCBmaWxlIG5vdCBpbiBhbnkgcHJpb3IgY29tbWl0IHdpbGwgYmUKICAgIHJlbW92ZWQuCgpJIHdvdWxkIGFs c28gbGlrZSB0byBwcm9wb3NlIHRoYXQgdGhlIHN0YWdpbmcgYXJlYSdzIHRyZWUgb2JqZWN0IGJlIHNhdmVkLApwZXJoYXBzIGluIHRoZSByZWZsb2cgb3IgcGVyaGFwcyBqdXN0IGFzIGEgZGFuZ2xpbmcgb2JqZWN0LiBUaGlzIHdvdWxkIGFsbG93CmdyYWNlZnVsIHJlY292ZXJ5IGZyb20gZ2l0IHJlc2V0IC0taGFyZC4gV2l0bmVzcyB0aGUgbWFueSBxdWVzdGlvbnMgYW5kIGFuc3dlcnMKb24gcmVjb3Zlcnk6CiAgICBodHRwOi8vc3RhY2tvdmVyZmxvdy5jb20vcXVlc3Rpb25zLzczNzQwNjkvdW5kby1naXQtcmVzZXQtaGFyZC13aXRoLXVuY29tbWl0dGVkLWZpbGVzLWluLXRoZS0Kc3RhZ2luZy1hcmVhCiAgICBodHRwOi8vc3RhY2tvdmVyZmxvdy5jb20vcXVlc3Rpb25zLzU3ODgwMzcvcmVjb3Zlci1mcm9tLWdpdC1yZXNldC1oYXJkCiAgICBodHRwOi8vc3RhY2tvdmVyZmxvdy5jb20vcXVlc3Rpb25zLzU0NzMvaG93LWNhbi1pLXVuZG8tZ2l0LXJlc2V0LWhhcmQtaGVhZDEKICAgIGh0dHA6Ly9naXRyZWFkeS5jb20vYWR2YW5jZWQvMjAwOS8wMS8xNy9yZXN0b3JpbmctbG9zdC1jb21taXRzLmh0bWwKICAgIGh0dHBzOi8vYmFuaS5jb20uYnIvMj AxNC8xMC9yZWNvdmVyaW5nLWxvc3QtZmlsZXMtYWZ0ZXItYS1naXQtcmVzZXQtaGFyZC8KICAgIGh0dHBzOi8vbWVkaXVtLmNvbS9AQ2FycmllR3Vzcy9ob3ctdG8tcmVjb3Zlci1mcm9tLWEtZ2l0LWhhcmQtcmVzZXQtYjgzMGI1ZTNmNjBjCgpBbGwgb2YgdGhlc2Ugc29sdXRpb25zIHJlY292ZXIgdGhlIGNvbnRlbnRzIG9mIGZpbGVzLCBidXQgbm90IHRoZWlyIG5hbWVzIG9yIHRoZQpkaXJlY3Rvcnkgc3RydWN0dXJlLiBTYXZpbmcgdGhlIHRyZWUgb2JqZWN0IHNvbWV3aGVyZSAoYW55d2hlcmUhKSB3b3VsZCBzb2x2ZQp0aGlzIHByb2JsZW0uCgpJIHdhcyBiaXR0ZW4gYnkgdGhpcyBpbiBhIHZpY2lvdXMgd2F5LiBJIHdhcyBzZXR0aW5nIHVwIGEgbmV3IHJlcG9zaXRvcnkgZm9yIGEKYnVuY2ggb2YgY29kZSBhbmQgZGF0YSAoZ2l0IGluaXQ7IGdpdCBhZGQgLiksIGNoYW5nZWQgbXkgbWluZCBhYm91dCBhZGRpbmcgdGhlCmRhdGEgKGdpdCByZXNldCAtLWhhcmQpLCBhbmQgbmVhcmx5IGxvc3QgZXZlcnl0aGluZy4gVGhlIG9ubHkgdHJlZSBvYmplY3QgdGhhdApjb3VsZCBiZSBmb3VuZCB3YXMgYW4gZW1wdHkgb25lLCBzbyBJIGdvdCBmaWxlIGNv bnRlbnRzIHdpdGhvdXQgbmFtZXMgb3IKZGlyZWN0b3JpZXMgKG5vdCBnb29kLCBiZWNhdXNlIGV4cGVyaW1lbnRhbCBjb25kaXRpb25zIGZvciB0aGUgZGF0YSB3ZXJlIGVuY29kZWQKaW4gdGhlIGRpcmVjdG9yeSBzdHJ1Y3R1cmUpLgoKQ2hlZXJzLApZb3RhbQ==