gawk-diffs
[Top][All Lists]
Advanced

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

[gawk-diffs] [SCM] gawk branch, cmake, updated. gawk-4.1.0-735-g8c64652


From: Juergen Kahrs
Subject: [gawk-diffs] [SCM] gawk branch, cmake, updated. gawk-4.1.0-735-g8c64652
Date: Wed, 10 Sep 2014 19:39:20 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, cmake has been updated
       via  8c646523ed32d4fd0d96e171618147d0c58c374f (commit)
      from  957d172c16af37d9ad7276b9f4d6c611b3073bb1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=8c646523ed32d4fd0d96e171618147d0c58c374f

commit 8c646523ed32d4fd0d96e171618147d0c58c374f
Author: Juergen Kahrs <address@hidden>
Date:   Wed Sep 10 21:38:58 2014 +0200

    One more introductory page.

diff --git a/doc/using-git.texi b/doc/using-git.texi
index 95a6a5e..8590e47 100644
--- a/doc/using-git.texi
+++ b/doc/using-git.texi
@@ -185,6 +185,9 @@ different from the steps you used in the old days when you 
downloaded
 a tar ball, extracted it and compiled the source code. It is mainly
 the very first step that looks different; instead of downloading the
 tar ball you need the tool @command{git}.
address@hidden the command @command{git} does not exist on your machine,
+you need adminstrator privileges to install it. By convention, the
+command is usuallay part of an installation package by the same name.}
 @example
   git clone git://git.savannah.gnu.org/gawk.git
   cd gawk
@@ -207,11 +210,79 @@ explanation, here we are satisfied with getting to know 
the practical
 steps necessary to get a working environment going that you can use
 in your daily work in a reliable way.
 
-You have created your own repository
-
 @node Setting up a proper @command{git} repository, Basics of GIT 
repositories, Introduction, Introduction
 @section Setting up a proper @command{git} repository
-How can I update and re-build
+After the initial @emph{checkout} you have access to all the source code
+files that the maintainers have pushed through the official release procedure.
+You may not have noticed, but each change is well documented and traceable.
+This process of tracing the change history is so precise, reproducable and
+fine-grained that any dubious change may be kicked out later and the author
+of dubious stuff identified by name and change date. Some bookkeeping is
+necessary for this and that's why you need @command{git}. @command{git}
+will do all this for you. Developers who have used @command{svn} or
address@hidden in the past will not be surprised to hear that each change
+is traceable precisely (they know that @command{svn} and @command{cvs}
+can do this, too).
+But the first-time user of @command{git} (as well as the @command{svn} user)
+may still have failed to notice what he actually did earlier in this 
@value{CHAPTER}.
+It is not just a mere copy of the source code that you created,
+it is a full copy of the @emph{upstream} repository server that you created
+(or @emph{clone}d). This means that others could make their own copy of
address@hidden repository and treat it as @emph{their upstream} repository.
+This is the essential difference between working with @command{svn} and
+working with @command{git}: by @emph{clone}ing you become a repository
+administrator, if you like it or not. As such you have some duties that
+go beyond the duties of a @command{svn} user. For example, you have to
+identify yourself properly as the owner of the repository by setting
+some global variables identifying you. The global settings will be used
+every time you connect again to the @emph{upstream} repository.
+
address@hidden
+  git config --global user.name "@emph{First-Name Last-Name}"
+  git config --global user.email @emph{email@@address.site}
+  git config --global color.ui auto
address@hidden smallexample
+
+You may leave these variables unset, but then you are reduced to an
+anonymous consumer-only behaviour whenever you connect to the @emph{upstream}
+repository. Later you will learn that there are many other variables
+to be set, most of them serving as defaults that can be overridden if
+you like. Choosing to work with defaults makes work quick and easy for the 
most frequent
+use cases, but that comes at a cost: With so many helpful defaults
+you may be overwhelmed by the detail and complexity of the real inner working.
+
address@hidden
+  git config --list
+  user.name=First-Name Last-Name
+  user.email=email@@address.site
+  color.diff=auto
+  color.status=auto
+  color.branch=auto
+  gui.spellingdictionary=en_US
+  core.repositoryformatversion=0
+  core.filemode=true
+  core.logallrefupdates=true
+  remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
+  remote.origin.url=ssh://jkahrs@@git.sv.gnu.org/srv/git/gawk.git
+  branch.master.remote=origin
+  branch.master.merge=refs/heads/master
+  branch.xgawk_load.remote=origin
+  branch.xgawk_load.merge=refs/heads/xgawk_load
address@hidden example
+
+If you set any of these variables or not, sooner or later you will want
+to catch up with the changes that happened in the upstream repository.
+So, how can I update my copy of the repository and re-build the source code?
+Updates are distributed by the @emph{pull} command.
address@hidden
+  git pull
+  make
address@hidden smallexample
+By default, all the changes available in the upstream repository will
+be copied into your local repository. That's so easy because we are working
+with defaults; we assume here that we still have the @emph{master} branch
+checked out (as described earlier) and we are not interested in changes
+to other existing branches. @emph{What is a branch?} you may wonder.
 
 How can I change to a different branch, what branches are there ?
 
@@ -232,12 +303,6 @@ What is tracking ?
 @c https://help.github.com/articles/what-is-a-good-git-workflow
 @c https://guides.github.com/introduction/flow/index.html
 
address@hidden
-  git config --global user.name "first-name last-name"
-  git config --global user.email address@hidden
-  git config --global color.ui auto
address@hidden smallexample
-
 - How can I use git to contribute source code ?
 You need an account at Savannah. Read this to understand the first steps:
   http://savannah.gnu.org/maintenance/UsingGit
@@ -273,6 +338,35 @@ properly.
 @node step-by-step instructions for a first-time-gawk-administrator, FAQs and 
HOWTOs, Tutorial for a first-time-gawk-contributor, Tutorial for a 
first-time-gawk-contributor
 @section step-by-step instructions for a first-time-gawk-administrator
 
address@hidden e-mail from Arnold 2014-08.24
address@hidden Thanks to Michal for pointing us in the right direction!
address@hidden I see this:
address@hidden 
address@hidden bash-4.2$ git config --get push.default
address@hidden simple
address@hidden 
address@hidden What does yours say?
address@hidden 
address@hidden It appears that "simple" will be the default in version 2.0:
address@hidden 
address@hidden From:
address@hidden 
http://blog.nicoschuele.com/posts/git-2-0-changes-push-default-to-simple
address@hidden 
address@hidden Matching
address@hidden 
address@hidden The 'matching' option is the default behavior in Git 1.x. It 
means that if you do a git push without specifying a branch, it will push all 
your local branches to their matching ones on your remote repository.
address@hidden 
address@hidden Simple
address@hidden 
address@hidden The new default in Git 2.x is 'simple'. It means that when doing 
a git push without specifying a branch, only your current branch will be pushed 
to the one git pull would normally get your code from."
address@hidden 
address@hidden So this must explain it.  I'll bet yours is set to "matching".  
I have no
address@hidden idea how mine got set to "simple", since I don't recall doing 
that.
address@hidden 
address@hidden In the future, I will simply make sure to push before switching 
branches.
address@hidden I think I actually prefer that behavior, since it's more 
intuitive to me.
+
+
 @node FAQs and HOWTOs, Links, Tutorial for a first-time-gawk-contributor, Top
 @chapter FAQs and HOWTOs
 @section general recipes for daily work

-----------------------------------------------------------------------

Summary of changes:
 doc/using-git.texi |  112 +++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 103 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

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