From: KES <kes-kes@yandex.ru>
To: git <git@vger.kernel.org>
Subject: Re: Can not save changes into stash
Date: Wed, 09 May 2018 16:27:16 +0300 [thread overview]
Message-ID: <5718771525872436@web47o.yandex.ru> (raw)
In-Reply-To: <6015131525872315@web37g.yandex.ru>
I even can not drop local changes:
$ git checkout local.conf
error: pathspec 'local.conf' did not match any file(s) known to git.
$ git log local.conf
commit 6df8bab88fd703c6859954adc51b2abaad8f59ec
Author: Eugen Konkov <kes-kes@yandex.ru>
Date: Wed May 9 15:31:02 2018 +0300
Implement module which allow override target option
Most usefull to configure application on developer host
09.05.2018, 16:25, "KES" <kes-kes@yandex.ru>:
> How to reproduce:
>
> $ git update-index --skip-worktree conf/local.conf
> $ git pull
> Updating 0cd50c7..bde58f8
> error: Your local changes to the following files would be overwritten by merge:
> conf/local.conf
> Please commit your changes or stash them before you merge.
> Aborting
> $ git stash save
> No local changes to save
next prev parent reply other threads:[~2018-05-09 13:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-09 13:25 Can not save changes into stash KES
2018-05-09 13:27 ` KES [this message]
2018-05-09 16:34 ` Torsten Bögershausen
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=5718771525872436@web47o.yandex.ru \
--to=kes-kes@yandex.ru \
--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