From: Neal Kreitzinger <nkreitzinger@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Akash <bcakashguru@gmail.com>, git@vger.kernel.org
Subject: Re: git fetch,git merge and git rebase
Date: Fri, 11 Feb 2011 11:13:58 -0600 [thread overview]
Message-ID: <4D556E56.30702@gmail.com> (raw)
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
prev parent reply other threads:[~2011-02-11 17:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-10 5:29 git fetch,git merge and git rebase Akash
2011-02-10 7:22 ` Alexey Shumkin
2011-02-10 8:22 ` Jonathan Nieder
2011-02-11 6:59 ` Akash
2011-02-10 7:25 ` Alexey Shumkin
2011-02-10 20:00 ` Neal Kreitzinger
2011-02-10 22:21 ` Neal Kreitzinger
2011-02-10 23:03 ` Jeff King
2011-02-11 7:00 ` Akash
2011-02-11 12:32 ` Felipe Contreras
2011-02-11 17:13 ` Neal Kreitzinger [this message]
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=4D556E56.30702@gmail.com \
--to=nkreitzinger@gmail.com \
--cc=bcakashguru@gmail.com \
--cc=felipe.contreras@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.