{"thread":{"id":"19143","subject":"[PATCH v2 0/4] user-manual: general improvements","startedAt":"2009-05-01T08:44:18Z","lastAt":"2009-05-01T08:44:22Z","messageCount":4,"participants":["Felipe Contreras"],"isPatch":true,"patchVersion":2,"patchTotal":4},"messages":[{"id":"112805","messageId":"1241167462-5984-1-git-send-email-felipe.contreras@gmail.com","threadId":"19143","inReplyTo":null,"subject":"[PATCH v2 0/4] user-manual: general improvements","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2009-05-01T08:44:18Z","receivedAt":"2009-05-01T08:44:18Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Part of the original patch series was already merged, this is the missing part\nmodified to address the comments.\n\nFelipe Contreras (4):\n  user-manual: general quoting improvements\n  user-manual: use 'fast-forward' instead of 'fast forward'\n  user-manual: add global config section\n  user-manual: simplify the user configuration\n\n Documentation/user-manual.txt |  923 +++++++++++++++++++++--------------------\n 1 files changed, 474 insertions(+), 449 deletions(-)\n"},{"id":"112806","messageId":"1241167462-5984-3-git-send-email-felipe.contreras@gmail.com","threadId":"19143","inReplyTo":"1241167462-5984-2-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v2 2/4] user-manual: use 'fast-forward' instead of 'fast forward'","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2009-05-01T08:44:20Z","receivedAt":"2009-05-01T08:44:20Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n Documentation/user-manual.txt |   14 +++++++-------\n 1 files changed, 7 insertions(+), 7 deletions(-)\n\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex a8558a1..9978027 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -1384,7 +1384,7 @@ were merged.\n \n However, if the current branch is a descendant of the other--so every\n commit present in the one is already contained in the other--then git\n-just performs a '``fast forward'''; the head of the current branch is moved\n+just performs a 'fast-forward'; the head of the current branch is moved\n forward to point at the head of the merged-in branch, without any new\n commits being created.\n \n@@ -1719,7 +1719,7 @@ producing a default commit message documenting the branch and\n repository that you pulled from.\n \n (But note that no such commit will be created in the case of a\n-<<fast-forwards,fast forward>>; instead, your branch will just be\n+<<fast-forwards,fast-forward>>; instead, your branch will just be\n updated to point to the latest commit from the upstream branch.)\n \n The `git pull` command can also be given '\".\"' as the 'remote' repository,\n@@ -1943,7 +1943,7 @@ $ git push ssh://yourserver.com/~you/proj.git master\n -------------------------------------------------\n \n As with `git fetch`, `git push` will complain if this does not result in a\n-<<fast-forwards,fast forward>>; see the following section for details on\n+<<fast-forwards,fast-forward>>; see the following section for details on\n handling this case.\n \n Note that the target of a 'push' is normally a\n@@ -1976,7 +1976,7 @@ details.\n What to do when a push fails\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n-If a push would not result in a <<fast-forwards,fast forward>> of the\n+If a push would not result in a <<fast-forwards,fast-forward>> of the\n remote branch, then it will fail with an error like:\n \n -------------------------------------------------\n@@ -2115,7 +2115,7 @@ $ git checkout release && git pull\n \n *Important note!*  If you have any local changes in these branches, then\n this merge will create a commit object in the history (with no local\n-changes git will simply do a 'fast forward' merge).  Many people dislike\n+changes git will simply do a 'fast-forward' merge).  Many people dislike\n the ``noise'' that this creates in the Linux history, so you should avoid\n doing this capriciously in the 'release' branch, as these noisy commits\n will become part of the permanent history when you ask Linus to pull\n@@ -2729,9 +2729,9 @@ In the previous example, when updating an existing branch, \"git fetch\"\n checks to make sure that the most recent commit on the remote\n branch is a descendant of the most recent commit on your copy of the\n branch before updating your copy of the branch to point at the new\n-commit.  Git calls this process a <<fast-forwards,fast forward>>.\n+commit.  Git calls this process a <<fast-forwards,fast-forward>>.\n \n-A 'fast forward' looks something like this:\n+A 'fast-forward' looks something like this:\n \n ................................................\n  o--o--o--o <-- old head of the branch\n-- \n1.6.3.rc3.13.g195b.dirty\n"},{"id":"112808","messageId":"1241167462-5984-4-git-send-email-felipe.contreras@gmail.com","threadId":"19143","inReplyTo":"1241167462-5984-3-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v2 3/4] user-manual: add global config section","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2009-05-01T08:44:21Z","receivedAt":"2009-05-01T08:44:21Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n Documentation/user-manual.txt |   27 +++++++++++++++++++++++++++\n 1 files changed, 27 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 9978027..d466199 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -40,6 +40,33 @@ without any explanation.\n Finally, see <<todo>> for ways that you can help make this manual more\n complete.\n \n+[[getting-started]]\n+Getting started\n+=============\n+\n+Git's configuration is distributed among different locations--this manual will\n+only to deal with 'global' (for the user) and 'repository' variables, where\n+'repository' variables take precedence over 'global' ones.\n+\n+You would probably want to start setting up something useful:\n+------------------------------------------------\n+$ git config --global color.ui auto\n+------------------------------------------------\n+\n+This will make prettier the output of certain commands such as `git diff`, but\n+that's not important; what is important here is that `color.ui` has been\n+stored in the 'global' configuration.\n+\n+View and manually modify the configuration by opening `~/.gitconfig`:\n+------------------------------------------------\n+[color]\n+        ui = auto\n+------------------------------------------------\n+\n+Other locations are `/etc/gitconfig` (system), and `.git/config` (repository).\n+\n+More git configurations will be covered in the rest of the manual, if you want\n+to learn more look at linkgit:git-config[1] for details.\n \n [[repositories-and-branches]]\n Repositories and Branches\n-- \n1.6.3.rc3.13.g195b.dirty\n"},{"id":"112807","messageId":"1241167462-5984-5-git-send-email-felipe.contreras@gmail.com","threadId":"19143","inReplyTo":"1241167462-5984-4-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v2 4/4] user-manual: simplify the user configuration","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2009-05-01T08:44:22Z","receivedAt":"2009-05-01T08:44:22Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"This is shorter, avoids the burder to think about the format of the\nconfiguration file, and git config is already used in other places in\nthe manual.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n Documentation/user-manual.txt |    8 +++-----\n 1 files changed, 3 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex d466199..6262c6c 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -1008,13 +1008,11 @@ Telling git your name\n ---------------------\n \n Before creating any commits, you should introduce yourself to git.  The\n-easiest way to do so is to make sure the following lines appear in a\n-file named `.gitconfig` in your home directory:\n+easiest way is to use the linkgit:git-config[1] command:\n \n ------------------------------------------------\n-[user]\n-\tname = Your Name Comes Here\n-\temail = you@yourdomain.example.com\n+$ git config --global user.name \"Your Name Comes Here\"\n+$ git config --global user.email you@yourdomain.example.com\n ------------------------------------------------\n \n (See the '\"CONFIGURATION FILE\"' section of linkgit:git-config[1] for\n-- \n1.6.3.rc3.13.g195b.dirty\n"}]}