all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: David Craven <david@craven.ch>
To: Danny Milosavljevic <dannym@scratchpost.org>
Cc: guix-devel <guix-devel@gnu.org>
Subject: Re: wip v2 u-boot support
Date: Fri, 9 Sep 2016 17:29:42 +0200	[thread overview]
Message-ID: <CAL1_imns7u7YSus=v9-1HCp1yp5=QS-cHJa0YVhPAyP3-PPJMQ@mail.gmail.com> (raw)
In-Reply-To: <20160909165722.6f4b4476@scratchpost.org>

Hi Danny,

> Anyway, attached gnu/system/u-boot.scm which it left off *again* (after git add, even). (How is having a new file not a *diff*erence? Sigh)

`git add -N .` adds untracked files to the list of tracked ones. git
diff should then work as expected.

I'm sorry to say that I can't apply your diffs :/

Can you please do the following?
git fetch origin master
git rebase -i origin/master and squash all your commits in to one big fat one
git format-patch -1
and manually attach the patch to an email in gmail or whatever =P

I'll then apply it to a clean checkout and we should get this thing working!

Thank you
David

  reply	other threads:[~2016-09-09 15:29 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-05 19:58 wip u-boot support Danny Milosavljevic
2016-09-05 20:29 ` wip v2 " Danny Milosavljevic
2016-09-06 16:34   ` David Craven
2016-09-08 22:09     ` David Craven
2016-09-08 23:57       ` Danny Milosavljevic
2016-09-09  0:02       ` Danny Milosavljevic
2016-09-09 12:02         ` David Craven
2016-09-09 14:35           ` Danny Milosavljevic
2016-09-09 14:57           ` Danny Milosavljevic
2016-09-09 15:29             ` David Craven [this message]
2016-09-09 18:09               ` [WIP PATCH] gnu: add U-Boot support to operating-system configuration Danny Milosavljevic
2016-09-10 17:52                 ` David Craven
2016-09-16 11:07                   ` Danny Milosavljevic
2016-09-16 12:26                     ` Vincent Legoll
2016-09-17  7:47                       ` David Craven
2016-09-17 17:08                         ` David Craven
2016-09-24  4:16                           ` Ludovic Courtès

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='CAL1_imns7u7YSus=v9-1HCp1yp5=QS-cHJa0YVhPAyP3-PPJMQ@mail.gmail.com' \
    --to=david@craven.ch \
    --cc=dannym@scratchpost.org \
    --cc=guix-devel@gnu.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. 
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

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.