Re: [git-users] Help! Git pull deleted files.

2012-12-29 Thread Konstantin Khomoutov
On Sat, 29 Dec 2012 00:16:37 - "Philip Oakley" wrote: > My guess would that you did a 'commit amend' (or small rebase) > locally that slightly changed your line of development relative to > your last push. As far as the git sha1 hash is concerned a slight > change and a ginormous change are t

Re: [git-users] Help! Git pull deleted files.

2012-12-28 Thread Philip Oakley
--- Original Message - From: Trans To: git-users@googlegroups.com Cc: Trans Sent: Friday, December 28, 2012 8:08 PM Subject: Re: [git-users] Help! Git pull deleted files. Thanks guys! Very helpful information. Allowed me to be confident about proceeding. Problem has been fixed and it we

Re: [git-users] Help! Git pull deleted files.

2012-12-28 Thread Trans
Thanks guys! Very helpful information. Allowed me to be confident about proceeding. Problem has been fixed and it went smoothly. I am still not sure how the repo could have gotten in that state since I am just about 100% positive there was no other push from anywhere. I will have to investigate

Re: [git-users] Help! Git pull deleted files.

2012-12-28 Thread Konstantin Khomoutov
On Fri, 28 Dec 2012 08:09:38 -0800 (PST) Trans wrote: > Hi, I just screwed my repo and need advice on how to get it back. Nothing is really screwed, see below. > I have been doing some major work on a project, and was finally ready > to push it. Foolish me did the work in master. So I go to pus