From 97c16e9ddcbdb43c620ba3b38206bd717259df87 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 9 Oct 2013 12:05:23 +0200 Subject: descriptions for about half of the chapters and sections MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/using-git.texinfo b/using-git.texinfo index 4123eb8..6874c84 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -74,11 +74,11 @@ such as how to use a command. @menu -* Getting started:: -* Introduction:: -* Branching out:: -* Collaborating:: -* Basic commands:: +* Getting started:: Getting started with Git +* Introduction:: What is Git and why is it the best? +* Branching out:: The flexibility of non-linearity +* Collaborating:: Shared goals, shared development +* Basic commands:: So happy hacking * I just don't know what went wrong:: * Version control:: * Interface:: @@ -95,11 +95,11 @@ such as how to use a command. @chapter Getting started @menu -* Identify yourself:: -* Create a repository:: -* Create an origin:: -* Gratis hosting:: -* Generate your key:: +* Identify yourself:: Configure Git to identify you when you make commits +* Create a repository:: Create your first repository +* Create an origin:: Create a backup repository +* Gratis hosting:: Get a hosting service for your superawesomazing projects +* Generate your key:: Create an identification key @end menu @@ -317,10 +317,10 @@ ssh-keygen -t rsa -C 'YOUR_EMAIL_ADDRESS' @chapter Introduction @menu -* What is Git?:: -* It is distributed:: -* Integrity:: -* Online documentation:: +* What is Git?:: So exactly what is Git? +* It is distributed:: The power of non-centralisation +* Integrity:: How you know that noone is messing with your project +* Online documentation:: Git comes with online documentation @end menu @@ -480,9 +480,9 @@ manpages on special topic: @chapter Branching out @menu -* Workflow:: -* Creating branches:: -* Merging branches:: +* Workflow:: Why should I branch? +* Creating branches:: How do I branch? +* Merging branches:: How do I merge my branches? @end menu @@ -609,10 +609,10 @@ the files and make a new commit. @chapter Collaborating @menu -* Cloning a repository:: -* Submitting patches:: -* Accepting patches:: -* Making pull requests:: +* Cloning a repository:: Start your collaboration +* Submitting patches:: Submit your work upstream +* Accepting patches:: Accepting received commits +* Making pull requests:: Request integration @end menu @@ -787,9 +787,9 @@ you want to see the changes. @chapter Basic commands @menu -* The trees of Git:: -* File operations:: -* Go back in time:: +* The trees of Git:: How history in Git is structured +* File operations:: Working with files in Git +* Go back in time:: Virtual time travel @end menu -- cgit v1.2.3-70-g09d2 From 84ce2049bf5035f35d1ac991ead6a82a852f5f37 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 9 Oct 2013 13:00:26 +0200 Subject: descriptions for the chapters and sections MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 72 +++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/using-git.texinfo b/using-git.texinfo index 6874c84..a85275d 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -78,14 +78,14 @@ such as how to use a command. * Introduction:: What is Git and why is it the best? * Branching out:: The flexibility of non-linearity * Collaborating:: Shared goals, shared development -* Basic commands:: So happy hacking -* I just don't know what went wrong:: -* Version control:: -* Interface:: -* Features:: -* Beyond Git:: -* GNU Free Documentation License:: -* Glossary:: +* Basic commands:: So happy hacking! +* I just don't know what went wrong:: Identifying when something broke and how to recover +* Version control:: Time to release a new version? +* Interface:: Git's interface design +* Features:: Git's design and features +* Beyond Git:: Just using Git is not enough +* GNU Free Documentation License:: Sharing is good, it does not make you a pirate +* Glossary:: Lost in all the big words? @end menu @c TODO Masterful flow @@ -1061,10 +1061,10 @@ what you are doing. @chapter I just don't know what went wrong @menu -* Naïve reset:: -* Using the stash:: -* Commit amendment:: -* Bisection:: +* Naïve reset:: Last resort recovery +* Using the stash:: Stash changes +* Commit amendment:: Correcting an unpushed commit +* Bisection:: Identifing when something broke @end menu @@ -1216,9 +1216,9 @@ bisection. @chapter Version control @menu -* Tagging versions:: -* Cherry picking:: -* Examine the log:: +* Tagging versions:: Releasing your new version +* Cherry picking:: Backporting and selective proposed update merge +* Examine the log:: Utilising Git's commit log @end menu @@ -1306,8 +1306,8 @@ command. @chapter Interface @menu -* First things first:: -* Wildcards:: +* First things first:: Order betters! (Especially with find) +* Wildcards:: Beware of wildcards @end menu @comment TODO man gitrevisions @@ -1346,18 +1346,18 @@ is annoying. @chapter Features @menu -* Git and permissions:: -* Git and timestamps:: -* Git and custom merge tools:: -* Git and shared build caches:: -* Git and keyword expansion:: -* Git and links:: -* Git and filenames:: -* Git and merge tracking:: -* Git and empty directories:: -* Git and file renames:: -* Git and encoding convertions:: -* Git and atomic commits:: +* Git and permissions:: File permission tracking in Git +* Git and timestamps:: File timestamp tracking in Git +* Git and custom merge tools:: Merge tool customisability in Git +* Git and shared build caches:: Shared build caches do not belong in source control +* Git and keyword expansion:: Keyword expansion is evil and do not belong in source control +* Git and links:: Symlink and hardlink tracking in Git +* Git and filenames:: Filename tracking in Git +* Git and merge tracking:: Merge commit tracking in Git +* Git and empty directories:: Nontracking of empty directories in Git +* Git and file renames:: File rename tracking in Git +* Git and encoding convertions:: Encoding convertions in Git +* Git and atomic commits:: Atomic commits and source control @end menu @@ -1611,12 +1611,12 @@ the state in the same manner. @chapter Beyond Git @menu -* Additional tools:: -* The binary problem:: -* Writing commit messages:: -* Standard files:: -* Keeping the repository clean:: -* A friendly build system:: +* Additional tools:: Programs that you can use togather with Git +* The binary problem:: Binary files are evil agaist source control +* Writing commit messages:: How to write good commit messages +* Standard files:: People have expections, and they should have +* Keeping the repository clean:: Good housekeeping is important +* A friendly build system:: Build systems makes the it easier for you and others @end menu @@ -1926,7 +1926,7 @@ you do not commit the program precompiled, libraries the project is using and integrated development environment (IDE) files. You can however make exceptions for precompiled -not-programs that are compiled by your build +non-programs that are compiled by your build system if you think it is useful enough for users to be available precompiled. For example you can have a manual precompiled. -- cgit v1.2.3-70-g09d2 From deb2d4d91c5cd7204ddfba2b89e8f2e04274fcc0 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 9 Oct 2013 13:14:52 +0200 Subject: m MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 78 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 56 insertions(+), 22 deletions(-) diff --git a/using-git.texinfo b/using-git.texinfo index a85275d..ac3172f 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -17,6 +17,49 @@ @end direntry +@c @set HARD_COPY_EDITION +@c @smallbook + + +@macro prelude +@center @titlefont{Prelude} +@iftex +@sp 1 +@end iftex + +@ifnottex +@quotation +@end ifnottex + +@noindent +This Git manual is intended to be +educational rather than a lookup +documentation. And written as a +tutorial, similarly to an educational +math book, except it does not include +problems to solve or test. +Consequentially, it is designed to +be read chapter by chapter with +occasional look-back. Because of +the scattered design of the content +layout, Git's online documentation, +accessible with @command{man git} +and @command{man git VERB}, is much +better for quick lookup of information, +such as how to use a command. +@end titlepage + +@c @ifclear HARD_COPY_EDITION +@c If you prefer a hard copy edition, you can order one from +@c ... +@c @end ifclear + +@ifnottex +@end quotation +@end ifnottex +@end macro + + @copying Copyright @copyright{} 2013 Mattias Andrée @@ -34,40 +77,31 @@ Texts. A copy of the license is included in the section entitled @node Top @top Using Git @insertcopying + +@prelude @end ifnottex @titlepage @title Using Git @subtitle Educational manual for Git, the version control system. + +@c @vskip 0pt plus 1filll +@c @c this way, it is centered exactly in pdf and approximently in dvi and ps +@c @c @center does not work for @image in dvi and ps +@c @multitable @columnfractions 0.15 0.7 +@c @item @tab @center @image{obj/logo,200px} +@c @end multitable +@c @vskip 0pt plus 1filll + @author by Mattias Andrée (maandree) @page @center git: A silly, incompetent, stupid, annoying, or childish person. @vskip 0pt plus 1filll @insertcopying -@page - -@center @titlefont{Prelude} -@sp 1 - -@noindent -This Git manual is intended to be -educational rather than a lookup -documentation. And written as a -tutorial, similarly to an educational -math book, except it does not include -problems to solve or test. -Consequentially, it is designed to -be read chapter by chapter with -occasional look-back. Because of -the scattered design of the content -layout, Git's online documentation, -accessible with @command{man git} -and @command{man git VERB}, is much -better for quick lookup of information, -such as how to use a command. -@end titlepage +@page +@prelude @contents -- cgit v1.2.3-70-g09d2 From ca00da987b965312829a09a1fe153634c1bb0066 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 9 Oct 2013 14:01:37 +0200 Subject: more dead fluttershy edition settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 19 +++++++++++++++---- using-git.texinfo | 11 ++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 72df850..9ab3563 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,8 @@ TEXINFO_DIR = . PREFIX = /usr DATA = /share +TEXIFLAGS = #--force + .PHONY: all @@ -43,17 +45,26 @@ pdf: $(PROGRAM).pdf.gz ps: $(PROGRAM).ps.gz dvi: $(PROGRAM).dvi.gz +#logo.pdf: logo.svg +# rsvg-convert --format=pdf "$<" > "$@" + +#logo.eps: obj/logo.ps +# ps2eps "$<" + +#logo.ps: logo.svg +# rsvg-convert --format=ps "$<" > "$@" + %.info: $(TEXINFO_DIR)/%.texinfo - $(MAKEINFO) "$<" + $(MAKEINFO) $(TEXIFLAGS) "$<" %.pdf: $(TEXINFO_DIR)/%.texinfo - texi2pdf "$<" + texi2pdf $(TEXIFLAGS) "$<" %.dvi: $(TEXINFO_DIR)/%.texinfo - $(TEXI2DVI) "$<" + $(TEXI2DVI) $(TEXIFLAGS) "$<" %.ps: $(TEXINFO_DIR)/%.texinfo - texi2pdf --ps "$<" + texi2pdf $(TEXIFLAGS) --ps "$<" .PHONY: install-info install: install-info diff --git a/using-git.texinfo b/using-git.texinfo index ac3172f..7404fb4 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -4,8 +4,16 @@ @setfilename using-git.info @settitle using git @afourpaper +@c @afourpaper @documentencoding UTF-8 @documentlanguage en + +@c @set HARD_COPY_EDITION +@c @smallbook +@ifset HARD_COPY_EDITION +@cropmarks +@setchapternewpage odd +@endif @finalout @c %**end of header @@ -17,9 +25,6 @@ @end direntry -@c @set HARD_COPY_EDITION -@c @smallbook - @macro prelude @center @titlefont{Prelude} -- cgit v1.2.3-70-g09d2 From d2c0c75007065de1ae3a3fd78dcb08b3332ed4b4 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 9 Oct 2013 14:12:00 +0200 Subject: derp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/using-git.texinfo b/using-git.texinfo index 7404fb4..5c734cd 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -52,7 +52,6 @@ accessible with @command{man git} and @command{man git VERB}, is much better for quick lookup of information, such as how to use a command. -@end titlepage @c @ifclear HARD_COPY_EDITION @c If you prefer a hard copy edition, you can order one from @@ -107,6 +106,7 @@ Texts. A copy of the license is included in the section entitled @page @prelude +@end titlepage @contents -- cgit v1.2.3-70-g09d2 From 199aaac15bebea9d680ddae706a219d8dec3495f Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 9 Oct 2013 14:22:33 +0200 Subject: clear TEXI_5 if you cannot compile the document MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/using-git.texinfo b/using-git.texinfo index 5c734cd..75f6151 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -8,12 +8,16 @@ @documentencoding UTF-8 @documentlanguage en +@set TEXI_5 + @c @set HARD_COPY_EDITION @c @smallbook @ifset HARD_COPY_EDITION +@ifset TEXI_5 @cropmarks +@end ifset @setchapternewpage odd -@endif +@end ifset @finalout @c %**end of header @@ -32,9 +36,11 @@ @sp 1 @end iftex +@ifset TEXI_5 @ifnottex @quotation @end ifnottex +@end ifset @noindent This Git manual is intended to be @@ -58,9 +64,12 @@ such as how to use a command. @c ... @c @end ifclear +@ifset TEXI_5 @ifnottex @end quotation @end ifnottex +@end ifset + @end macro -- cgit v1.2.3-70-g09d2 From 645db62083dea61629ffb2a8e244e2bca9e733a5 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 9 Oct 2013 12:44:53 +0200 Subject: m MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/using-git.texinfo b/using-git.texinfo index 75f6151..012b3da 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -4,7 +4,7 @@ @setfilename using-git.info @settitle using git @afourpaper -@c @afourpaper +@c @afivepaper @documentencoding UTF-8 @documentlanguage en -- cgit v1.2.3-70-g09d2