Re: HACKING doc git 3rd possiblity

2008-12-18 Thread James Youngman
On Tue, Dec 16, 2008 at 4:19 PM,   wrote:
> In HACKING

Thanks for the suggestions.

>   If you have made *no* changes:
>   git pull
>
>   If you *have* made changes and committed them to "master", do this:
>   git fetch
>   git rebase origin
>
> OK, but add
>
>   If you *have* made changes but *have not* committed them to
>   "master", do this:
>
> As to what "this" should be, well I don't know.

If you have committed changes on a topic branch - and this is usually
the most convenient way to work on non-trivial changes - see "Make
your changes on a private "topic" branch" below.

If you have uncommitted changes in your working copy, most operations
will not affect them.  Still, it is probably simplest to commit them
to a topic branch; otherwise changes that "git checkout" needs to make
could be blocked by your local changes.


>
> As to what "this" should be, well I don't know. All I know is "fetch",
> "committed to master"... must be some BDSM game :-)
>
>
> ___
> Bug-coreutils mailing list
> Bug-coreutils@gnu.org
> http://lists.gnu.org/mailman/listinfo/bug-coreutils
>


___
Bug-coreutils mailing list
Bug-coreutils@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-coreutils


Re: better figure out a paperless copyright assignment method

2008-12-18 Thread jidanni
Wait a second, when making a Wikipedia editing contribution we just
click on a box below some licence statement. Why can't you guys use
that method?


___
Bug-coreutils mailing list
Bug-coreutils@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-coreutils


Re: better figure out a paperless copyright assignment method

2008-12-18 Thread Eric Blake
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

According to jida...@jidanni.org on 12/18/2008 9:55 PM:
> Wait a second, when making a Wikipedia editing contribution we just
> click on a box below some licence statement. Why can't you guys use
> that method?

Why are you asking us, when we can't do anything to change the situation?
 You should be asking the FSF licensing list:
ass...@gnu.org
http://www.gnu.org/prep/maintain/maintain.html#Copyright-Papers

- --
Don't work too hard, make some time for fun as well!

Eric Blake e...@byu.net
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAklLKiQACgkQ84KuGfSFAYAXgQCgroRHxhWSDAz28PU2eR+SuxWk
8fUAnigE6CICWuXxqlNNz1wY1uKzBNYW
=q+7z
-END PGP SIGNATURE-


___
Bug-coreutils mailing list
Bug-coreutils@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-coreutils


Re: better figure out a paperless copyright assignment method

2008-12-18 Thread jidanni
> "EB" == Eric Blake  writes:

EB> According to jida...@jidanni.org on 12/18/2008 9:55 PM:
>> Wait a second, when making a Wikipedia editing contribution we just
>> click on a box below some licence statement. Why can't you guys use
>> that method?

EB> Why are you asking us, when we can't do anything to change the situation?
EB>  You should be asking the FSF licensing list:
EB> ass...@gnu.org
EB> http://www.gnu.org/prep/maintain/maintain.html#Copyright-Papers

Hmm, odd English there: "per". Hmm, kind of long. Anyway OK, CC'ing
them to please mention in that document if "click through" agreements
are useful at all.

Anyway, good thing my contributions are always only few-liners.


___
Bug-coreutils mailing list
Bug-coreutils@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-coreutils