[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Git-patch: spanish WAS: / has funny titles?

From: Daniel Tonda
Subject: Re: Git-patch: spanish WAS: / has funny titles?
Date: Sat, 6 Jan 2007 03:00:27 -0600


Just reporting, that I finally did the pull and here's a surprise, it
didn't complain!

$ git pull git:// web/master:
Generating pack...
Done counting 120 objects.
Result has 91 objects.
Deltifying 91 objects.
100% (91/91) done
Unpacking 91 objects
Total 91, written 91 (delta 71), reused 0 (delta 0)
100% (91/91) done
Trying really trivial in-index merge...
In-index merge
de/install/getting-started.html                    |    4
de/switch/testimonials.html                        |  195 +++++++++++++-------
es/install/getting-started.html                    |    4
fr/install/getting-started.html                    |    4
nl/install/getting-started.html                    |    4
site/devel/participating/bug-meister.html          |   39 ++--
site/devel/participating/build-meister.html        |   29 ---
site/devel/participating/call-for-help.html        |   38 +---
site/devel/participating/documentation-adding.html |   18 --
site/devel/participating/localization.html         |    4
site/devel/participating/release-meister.html      |   25 +--
site/install/getting-started.html                  |    4
site/install/older-versions.html                   |    6 -
site/news.ihtml                                    |   20 +-
site/old-news.html                                 |   20 ++
site/sponsor/options.html                          |    4
16 files changed, 217 insertions(+), 201 deletions(-)


I went to the website to check that the patches looked ok, and there's 2.11.9???

(the patches are just fine).

I downloaded the 2.11.8 yesterday!

Fast, fast, fast...

Now a question, since the website is going to be mainly maintining and
checking it for typos or additions, I'd like to start on the tutorial,
is it also managed by git?

Daniel Tonda C.

2007/1/5, Johannes Schindelin <address@hidden>:

On Fri, 5 Jan 2007, John Mandereau wrote:

> Daniel Tonda wrote:
> >
> > Should I do the pull after the modifications?
> Yes, and it might tell you that you have to merge.

I don't think that it will tell you that you have to merge: you have no
uncommitted files.

It will realize that you have progressed since last pulling (or
branching), and that upstream has progressed, too, and perform a merge
itself (that is what pull does: fetch _and_ merge). Then it will find that
the changes are already in, and be happy.

However, do not expect the commit id to be the same as the upstream commit
id: Your line of development _is_ different, even if the resulting _tree_
is not, so from now on you will have a side branch from the upstream. But
that is okay, since it reflects reality.


Daniel Tonda C.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]