delta/git.git/Documentation/user-manual.txt, branch ss/userdiff-update-csharp-java github.com: git/git.git Documentation: fix misuses of "nor" 2014-03-31T22:16:22+00:00 Justin Lebar jlebar@google.com 2014-03-31T22:11:44+00:00 a58088abe2011b6f486de8acd54432f6d9bcecfc Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'ow/manpages-typofix' 2014-02-07T19:55:12+00:00 Junio C Hamano gitster@pobox.com 2014-02-07T19:55:11+00:00 efe5f1d25d198ae8796b6f095c2cffae270bb9b6 Various typofixes, all looked correct. * ow/manpages-typofix: Documentation: fix typos in man pages 
Various typofixes, all looked correct.

* ow/manpages-typofix:
  Documentation: fix typos in man pages
Documentation: fix typos in man pages 2014-02-05T22:35:45+00:00 Øystein Walle oystwa@gmail.com 2014-02-05T22:19:43+00:00 5fe8f49b6d59cf143a5898ddbb161444a95fa871 Signed-off-by: Øystein Walle <oystwa@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Øystein Walle <oystwa@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
user-manual: improve html and pdf formatting 2014-01-06T19:30:17+00:00 Thomas Ackermann th.acker@arcor.de 2014-01-04T09:07:51+00:00 145e073b84de03f699e105a3990a7bbf3740309e Use asciidoc style 'article' instead of 'book' and change asciidoc title level. This removes blank first page and superfluous "Part I" page (there is no "Part II") in pdf output. Also pdf size is decreased by this from 77 to 67 pages. In html output this removes unnecessary sub-tocs and chapter numbering. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Use asciidoc style 'article' instead of 'book' and change asciidoc
title level.  This removes blank first page and superfluous "Part I"
page (there is no "Part II") in pdf output. Also pdf size is
decreased by this from 77 to 67 pages.  In html output this removes
unnecessary sub-tocs and chapter numbering.

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'ss/doclinks' 2013-09-17T18:42:54+00:00 Junio C Hamano gitster@pobox.com 2013-09-17T18:42:54+00:00 287c0feeab28455e86ee376bc452efa61a30b528 When we converted many documents that were traditionally text-only to be formatted to AsciiDoc, we did not update links that point at them to refer to the formatted HTML files. * ss/doclinks: Documentation: make AsciiDoc links always point to HTML files 
When we converted many documents that were traditionally text-only
to be formatted to AsciiDoc, we did not update links that point at
them to refer to the formatted HTML files.

* ss/doclinks:
  Documentation: make AsciiDoc links always point to HTML files
Documentation: make AsciiDoc links always point to HTML files 2013-09-06T21:49:06+00:00 Sebastian Schuberth sschuberth@gmail.com 2013-09-06T20:03:22+00:00 d5ff3b4be5b2e3eee9c4b298f00ed7a4c1c556a4 AsciiDoc's "link" is supposed to create hyperlinks for HTML output, so prefer a "link" to point to an HTML file instead of a text file if an HTML version of the file is being generated. For RelNotes, keep pointing to text files as no equivalent HTML files are generated. If appropriate, also update the link description to not contain the linked file's extension. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
AsciiDoc's "link" is supposed to create hyperlinks for HTML output, so
prefer a "link" to point to an HTML file instead of a text file if an HTML
version of the file is being generated. For RelNotes, keep pointing to
text files as no equivalent HTML files are generated.

If appropriate, also update the link description to not contain the linked
file's extension.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
"git prune" is safe 2013-08-27T22:14:46+00:00 Thomas Ackermann th.acker@arcor.de 2013-08-27T18:05:50+00:00 ddeb817f25fea45dee5456c48d723e56b9f8991b "git prune" is safe in case of concurrent accesses to a repository but using it in such a case is not recommended. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
"git prune" is safe in case of concurrent accesses to a repository
but using it in such a case is not recommended.

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Remove irrelevant reference from "Tying it all together" 2013-08-27T22:14:45+00:00 Thomas Ackermann th.acker@arcor.de 2013-08-27T18:04:58+00:00 381183fbc6c3fea1264e4fc6c977bf31cdfb812a Sorry Jon, but this might not be of any help to new Git users ;) Acked-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Sorry Jon, but this might not be of any help to new Git users ;)

Acked-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Remove unnecessary historical note from "Object storage format" 2013-08-27T22:14:45+00:00 Thomas Ackermann th.acker@arcor.de 2013-08-27T18:04:08+00:00 e14c86156c86c3f547b5f92b5c9e91ea8b4dbc8c Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Improve section "Merging multiple trees" 2013-08-27T22:14:44+00:00 Thomas Ackermann th.acker@arcor.de 2013-08-27T18:03:09+00:00 e8e9964de489412aae2c9b8420d2fab8b00e9d12 Remove unnecessary quoting. Simplify description of three-way merge. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Remove unnecessary quoting.
Simplify description of three-way merge.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>