From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3220 invoked by alias); 29 Oct 2007 18:58:51 -0000 Received: (qmail 3213 invoked by uid 22791); 29 Oct 2007 18:58:51 -0000 X-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,DK_POLICY_SIGNSOME,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 29 Oct 2007 18:58:49 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.1) with ESMTP id l9TIwmDE011646 for ; Mon, 29 Oct 2007 14:58:48 -0400 Received: from pobox.yyz.redhat.com (pobox.yyz.redhat.com [10.15.31.4]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l9TIwk3P014244; Mon, 29 Oct 2007 14:58:46 -0400 Received: from toner.toronto.redhat.com (toner.yyz.redhat.com [10.15.16.55]) by pobox.yyz.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id l9TIwkHJ016546; Mon, 29 Oct 2007 14:58:46 -0400 Message-ID: <47262D66.8000601@redhat.com> Date: Mon, 29 Oct 2007 18:58:00 -0000 From: Sami Wagiaalla User-Agent: Thunderbird 2.0.0.5 (X11/20070727) MIME-Version: 1.0 To: Tim Moore CC: frysk Subject: Re: git pull vs git rebase References: <472379E9.4050806@redhat.com> In-Reply-To: <472379E9.4050806@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact frysk-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-owner@sourceware.org X-SW-Source: 2007-q4/txt/msg00092.txt.bz2 so after I am done my editing i do: $git fetch $git rebase [resolved conflicts] $git rebase --continue $git push is that correct ?