From: Neal Kreitzinger <nkreitzinger@gmail.com>
Date: Fri, 11 Feb 2011 17:13:58 GMT
Subject: Re: git fetch,git merge and git rebase
Message-ID: <4D556E56.30702@gmail.com>
In-Reply-To: <AANLkTinsBz0Yi5XXYUcaJMTvkjuhtNjotx0VWRFcKX3d@mail.gmail.com>

On 2/11/2011 6:32 AM, Felipe Contreras wrote:
> On Fri, Feb 11, 2011 at 12:21 AM, Neal Kreitzinger
> <nkreitzinger@gmail.com>  wrote:
>> On 2/9/2011 11:29 PM, Akash wrote:
>>> Hi,
>>>
>>> I am new to git .Can someone explain in simple terms what git fetch,git
>>> merge and git rebase do?..I tried googling but was very confused after
>>> going
>>> thro it.
>>>
>>> Also, can someone prescribe a link which explains git in detail right from
>>> scratch.
>>>
>>>
>> another definition of git-rebase:
>>
>> git-rebase:  the MOST DANGEROUS command in git.  you can easily DESTROY your
>> repo if you don't know what you're doing!  Until you get the hang of it,
>> always make a copy of the before-image of the branch your rebasing
>> (mybranch) by doing a "git checkout mybranch" and then "git branch
>> copy-of-mybranch".  Then if you destroy mybranch you can recover it from
>> copy-of-mybranch.
> What about 'git rebase --hard', or 'git branch -D'? In all cases you
> can recover by using the reflog.
>
i take you meant 'git reset --hard'...

v/r,
neal