From mboxrd@z Thu Jan  1 00:00:00 1970
From: suvayu ali <fatkasuvayu+linux@gmail.com>
Subject: Re: getorg.sh script
Date: Thu, 28 Jul 2011 23:50:35 +0200
Message-ID: <CAMXnza24S5_b5=9VV26H9HYeXG80fRMd35DdJ84_MAnUA21UUw@mail.gmail.com>
References: <alpine.BSF.2.00.1107280550530.88255@freire1.furyyjbeyq.arg>
	<87ipqm33i8.fsf@norang.ca>
	<alpine.BSF.2.00.1107281732100.12506@freire1.furyyjbeyq.arg>
	<8739hqccfm.fsf@norang.ca>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:56268)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <fatkasuvayu@gmail.com>) id 1QmYTp-0003yN-Gu
	for emacs-orgmode@gnu.org; Thu, 28 Jul 2011 17:50:58 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <fatkasuvayu@gmail.com>) id 1QmYTo-0007VW-B5
	for emacs-orgmode@gnu.org; Thu, 28 Jul 2011 17:50:57 -0400
Received: from mail-fx0-f41.google.com ([209.85.161.41]:51144)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <fatkasuvayu@gmail.com>) id 1QmYTo-0007VO-1Q
	for emacs-orgmode@gnu.org; Thu, 28 Jul 2011 17:50:56 -0400
Received: by fxg9 with SMTP id 9so2029890fxg.0
	for <emacs-orgmode@gnu.org>; Thu, 28 Jul 2011 14:50:55 -0700 (PDT)
In-Reply-To: <8739hqccfm.fsf@norang.ca>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: </archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Bernt Hansen <bernt@norang.ca>
Cc: Jude DaShiell <jdashiel@shellworld.net>, emacs-orgmode@gnu.org

Hi Jude,

On Thu, Jul 28, 2011 at 11:39 PM, Bernt Hansen <bernt@norang.ca> wrote:
> If that happens and you get a conflict you don't know how to deal with
> and you're willing to reedit your Makefile changes (which you would have
> to do anyway if you get a fresh clone) then you can just nuke everything
> with
>
> $ git checkout master
> $ git reset --hard origin/master
>
> and then redo your Makefile changes instead of recloning.
>

If you are willing to commit your changes to the Makefile in your local
repository you can do this:

$ <edit> Makefile # here master = origin/master
$ git commit -i Makefile -m "My changes" # master = origin/master+1
$ git pull --rebase --stat

-- 
Suvayu

Open source is the future. It sets us free.