From: suvayu ali <fatkasuvayu+linux@gmail.com>
To: Bernt Hansen <bernt@norang.ca>
Cc: Jude DaShiell <jdashiel@shellworld.net>, emacs-orgmode@gnu.org
Subject: Re: getorg.sh script
Date: Thu, 28 Jul 2011 23:50:35 +0200 [thread overview]
Message-ID: <CAMXnza24S5_b5=9VV26H9HYeXG80fRMd35DdJ84_MAnUA21UUw@mail.gmail.com> (raw)
In-Reply-To: <8739hqccfm.fsf@norang.ca>
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.
prev parent reply other threads:[~2011-07-28 21:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-28 9:56 getorg.sh script Jude DaShiell
2011-07-28 14:04 ` Bernt Hansen
2011-07-28 21:34 ` Jude DaShiell
2011-07-28 21:39 ` Bernt Hansen
2011-07-28 21:50 ` suvayu ali [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
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMXnza24S5_b5=9VV26H9HYeXG80fRMd35DdJ84_MAnUA21UUw@mail.gmail.com' \
--to=fatkasuvayu+linux@gmail.com \
--cc=bernt@norang.ca \
--cc=emacs-orgmode@gnu.org \
--cc=jdashiel@shellworld.net \
/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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).