[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Stupid git!
From: |
Steinar Bang |
Subject: |
Re: Stupid git! |
Date: |
Mon, 14 Sep 2015 12:09:33 +0200 |
User-agent: |
Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) |
>>>>> Alan Mackenzie <address@hidden>:
>> But in general, you either 'git stage' and then 'git pull', or 'git
>> add', 'git commit' (!), and then either rebase or merge upstream.
> It's when first doing `git add', then `git pull' when I've lost changes
> before.
It happens sometimes, when you stash files that have been staged with
"git add".
It happened to me once (when I was trying to disprove Alan's claims
earlier) but I have been unable to reproduce it since.
If someone can get a reproducible case, it would be a good idea to make
a bug report with the case to git.