From: Felipe Contreras <felipe.contreras@gmail.com>
To: Neal Kreitzinger <nkreitzinger@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 14:32:47 +0200 [thread overview]
Message-ID: <AANLkTinsBz0Yi5XXYUcaJMTvkjuhtNjotx0VWRFcKX3d@mail.gmail.com> (raw)
In-Reply-To: <4D5464E7.2010407@gmail.com>
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.
--
Felipe Contreras
next prev parent reply other threads:[~2011-02-11 12:32 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 [this message]
2011-02-11 17:13 ` Neal Kreitzinger
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=AANLkTinsBz0Yi5XXYUcaJMTvkjuhtNjotx0VWRFcKX3d@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=bcakashguru@gmail.com \
--cc=git@vger.kernel.org \
--cc=nkreitzinger@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).