[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: HACKING doc git 3rd possiblity
From: |
James Youngman |
Subject: |
Re: HACKING doc git 3rd possiblity |
Date: |
Thu, 18 Dec 2008 10:57:34 +0000 |
On Tue, Dec 16, 2008 at 4:19 PM, <address@hidden> 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
> address@hidden
> http://lists.gnu.org/mailman/listinfo/bug-coreutils
>