Well, it's called `git stash` and not `git trash`... :-D
That's your own usage of it, but its main usage is different.
This is not a solution, but it's better than nothing and I second it.
On 25-02-14 13:33, Matthieu Moy wrote:
Holger Hellmuth hellm...@ira.uka.de writes:
Am 24.02.2014
, Omar Othman omar.oth...@booking.com wrote:
In general, whenever something a user should do, git always tells. So, for
example, when things go wrong with a merge, you have the option to abort.
When you are doing a rebase, git tells you to do git commit --amend, and
then git rebase --continue
Please note that what I am asking for is not always dropping the
stash, but doing that *only* when the merge conflict is resolved. This
is simply getting the whole command to be consistent. If you do `git
stash pop` and it succeeds, the stash reference is dropped. If you do
git stash pop` and
[omar_othman main (trunk|MERGING*)]$ git add path/to/file.txt
[omar_othman main (trunk*)]$
Note how the status message has changed to show that git is now happy.
It is at that moment that the stash reference should be dropped
Dropping the stash on a git add operation would be really, really
Am 24.02.2014 17:21, schrieb Matthieu Moy:
$ git add foo.txt
$ git status
On branch master
Changes to be committed:
(use git reset HEAD file... to unstage)
modified: foo.txt
Maybe status should display a stash count if that count is 0, as
this is part of the state of the
Matthieu Moy matthieu@grenoble-inp.fr writes:
Holger Hellmuth hellm...@ira.uka.de writes:
Am 24.02.2014 17:21, schrieb Matthieu Moy:
$ git add foo.txt
$ git status
On branch master
Changes to be committed:
(use git reset HEAD file... to unstage)
modified: foo.txt
and sorry for the long email.
--
Best Regards,
Omar Othman
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi there,
I'm fairly new to git and I wanted to ask about a certain behavior that
I want to fix myself (if you agree with me that it is a misbehavior)...
since I've never contributed to open source and it'll be an important
step for me to start and get something done.
In general, whenever
8 matches
Mail list logo
