Signed-off-by: Thomas Ackermann
---
Documentation/technical/index-format.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/technical/index-format.txt
b/Documentation/technical/index-format.txt
index b7093af..7392ff6 100644
--- a/Documentation/technical/index
Signed-off-by: Thomas Ackermann
---
Documentation/RelNotes/2.6.0.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/RelNotes/2.6.0.txt b/Documentation/RelNotes/2.6.0.txt
index 4a0a589..e86de81 100644
--- a/Documentation/RelNotes/2.6.0.txt
+++ b/Documentation
Diff is used in install-webdoc.sh to identify changed files
which need to be installed, but the output of diff is not
needed during the installation process. So squelch diff
output by redirecting to /dev/null.
Signed-off-by: Thomas Ackermann
---
Documentation/install-webdoc.sh | 2 +-
1 file
Signed-off-by: Thomas Ackermann
---
Documentation/git-ls-files.txt | 2 +-
Documentation/user-manual.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 0e08f56..75c3f41 100644
--- a/Documentation/git
Gerhard Grimm detec.com> writes:
>
> In order to set up automated builds and tests of the CMake toolchain
(www.cmake.org) on HP-UX 11.11 (hppa)
> and 11.23 (ia64), I needed to install git on those platforms.
> The latest binary package available from hpux.connect.org.uk is version
1.8.5.3, whi
Signed-off-by: Thomas Ackermann
---
Documentation/git-http-backend.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-http-backend.txt
b/Documentation/git-http-backend.txt
index e8c13f6..d422ba4 100644
--- a/Documentation/git-http-backend.txt
+++ b
Signed-off-by: Thomas Ackermann
---
Documentation/RelNotes/2.2.0.txt| 6 +++---
Documentation/config.txt| 10 +-
Documentation/git-bisect-lk2009.txt | 4 ++--
Documentation/git-clean.txt
Signed-off-by: Thomas Ackermann
---
Documentation/gittutorial.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index af9f709..710e636 100644
--- a/Documentation/gittutorial.txt
+++ b/Documentation
I also re-read the whole document and think it's still up-to-date
with Git 2.0. But I might have missed some subtler points.
Thomas
- Original Nachricht
Von: Junio C Hamano
An: Thomas Ackermann
Datum: 11.11.2014 23:51
Betreff: Re: [PATCH] gittutorial.txt: remove refe
Signed-off-by: Thomas Ackermann
---
Documentation/RelNotes/2.1.0.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Documentation/RelNotes/2.1.0.txt b/Documentation/RelNotes/2.1.0.txt
index be598ad..e958498 100644
--- a/Documentation/RelNotes/2.1.0.txt
+++ b/Documentation/RelNotes/2.1.0
removes unnecessary sub-tocs and chapter numbering.
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile| 2 +-
Documentation/user-manual.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 91a12c7..36c
Since f223459 "status: always show tracking branch even no change"
'git status' (and 'git checkout master' always says
"Your branch is up-to-date with 'origin/master'"
even if 'origin/master' is way ahead from local 'master'.
---
Thomas
--
To unsubscribe from this list: send the line "unsubscri
This originally was an UTF8-BOM in user-manual.txt and notepad++ was so clever
not to show it in the patch-file :-| Pasting this into my webmail then produced
complete rubbish which I didn't noticed ...
- Original Nachricht
Von: Jonathan Nieder
An: Thomas Ackermann
te with 'origin/master'"
which is obviously wrong.
---
Thomas
- Original Nachricht
Von: Jiang Xin
An: Thomas Ackermann
Datum: 06.01.2014 06:31
Betreff: Re: [Bug report] 'git status' always says "Your branch is up-to-date
with 'origin/master'
>
> Unfortunately that's not true. In repo_b your ref for origin/master
> has not moved. It has remotely (meaning refs/heads/master in repo_a
> has moved), but git status is not hitting the remote to find out; it
> only looks at the local state. To see what I mean, run git fetch in
> repo_b. Onc
> > But for the simple use case where you only have a master
> > branch I consider it not really helpful and - at least for me -
> > misleading.
>
> I see what you mean, and you're not the only one.
>
> Git follows a rule of "never contact another machine unless explicitly
> asked to using a co
- Add to Documentation/Makefile
- Start every TODO with a new line
- Fix indentation error
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile| 1 +
Documentation/technical/http-protocol.txt | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a
Create a proper header when formatted as html.
Signed-off-by: Thomas Ackermann
---
Documentation/technical/pack-heuristics.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/technical/pack-heuristics.txt
b/Documentation/technical/pack-heuristics.txt
This is a reroll of my attempt to create usable HTML for http-protocol.txt.
The first patch addresses Junio's remarks regarding the conversion to better
ASCIIDOC.
The patch contains some whitespace-only changes so these shouldn't be ignored
while applying.
The second patch tries to fix one of
/ "S:" instead of "(C)" / "(S)" for consistency and
to avoid having formatted "(C)" as copyright symbol in HTML
- Use only spaces and not a combination of tabs and spaces for whitespace
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile
Signed-off-by: Thomas Ackermann
---
Documentation/technical/http-protocol.txt | 45 +++
1 file changed, 22 insertions(+), 23 deletions(-)
diff --git a/Documentation/technical/http-protocol.txt
b/Documentation/technical/http-protocol.txt
index 7f0cf0b..90beb32
ot;(S)" for consistency and
to avoid having formatted "(C)" as copyright symbol in HTML
- Use only spaces and not a combination of tabs and spaces for whitespace
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile| 3 +-
Documentation/technical/http
please ignore this one
- Original Nachricht
Von: Thomas Ackermann
An: git@vger.kernel.org
Datum: 26.01.2014 13:54
Betreff: [PATCH 1/2] create HTML for http-protocol.txt
> [PATCH 1/2] create HTML for http-protocol.txt
>
> ./Documentation/technical/http-protoco
ees"
-> better wording
[PATCH 10/13] Remove unnecessary historical note from "Object storage format"
-> same as in v1
[PATCH 11/13] Remove obscure reference from "Examples"
-> this patch was dropped
[PATCH 12/13] Remove irrelevant reference from "Tying it all
Reviewed-by: Jonathan Nieder
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index fe723e4..103ec9a 100644
--- a/Documentation/user
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 103ec9a..bdefd9a 100644
--- a/Documentation/user-manual.txt
+++ b
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index bdefd9a..3f44ca0 100644
--- a/Documentation/user-manual.txt
+++ b
"git pull ." works, but "git merge" is the recommended
way for new users to do things. (The old description
also should have read "The former is actually *not* very
commonly used".)
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 8
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 6241a43..465d9cb 100644
--- a/Documentation/user-manual.txt
+++ b
Combine the two cases for "git add" into one.
Add verb "use" to "git rm" case.
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 10 ++
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/Documentation/user-manual.txt b/Docum
Add some missing punctuation.
Simplify description of "git branch -d/-D".
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 20
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-
Sorry Jon, but this might not be of any help to new Git users ;)
Acked-by: Jon Loeliger
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index
"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
---
Documentation/user-manual.txt | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/Documentation/user-ma
Remove unnecessary quoting.
Simplify description of three-way merge.
Signed-off-by: Jonathan Nieder
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 27 +--
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/Documentation/user-manual.txt
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index a7ca3e3..56bd088 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4145,8
Signed-off-by: Thomas Ackermann
---
Documentation/RelNotes/2.4.0.txt | 2 +-
Documentation/technical/api-error-handling.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/RelNotes/2.4.0.txt b/Documentation/RelNotes/2.4.0.txt
index 386c75d
/13] Improve section "Manipulating branches"
[PATCH 09/13] Improve section "Merge multiple trees"
[PATCH 10/13] Remove unnecessary historical note from "Object storage format"
[PATCH 11/13] Remove obscure reference from "Examples"
[PATCH 12/13] Remove irrelev
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index fe723e4..103ec9a 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 103ec9a..cb30929 100644
--- a/Documentation/user-manual.txt
+++ b
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index cb30929..b450980 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation
"git pull ." works, but "git merge" is the recommended
way for new users to do things. (The old description
also should have read "The former is actually *not* very
commonly used".)
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 15 ++--
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index ca78333..ccbddc7 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation
Combine the two cases for "git add" into one.
Add verb "use" to "git rm" case.
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/Documentation/user-manual.txt b/Docum
Describe the conflict resolution in terms of the
commands the user is supposed to use.
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index
Add some missing punctuation.
Simplify description of "git branch -d/-D".
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 19 +++
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-
Remove unnecessary quoting.
Simplify description of three-way merge.
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index d5baf03
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index aa6bfab..0d3f04e 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2131,8
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index f713f26..aa6bfab 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4132,8
Sorry Jon, but this might not be of any help to new Git users ;)
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 0d3f04e..08d8c91 100644
According to the man-pages of "git prune" and "git fsck",
both are safe nowadays.
Signed-off-by: Thomas Ackermann
---
Documentation/user-manual.txt | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documenta
>
> I wonder if this longer wall of text (added in 13be3e31, 2010-01-29)
> is too aggressive.
>
> It is the only piece of advice that I explicitly disable in
> ~/.gitconfig, so I haven't looked at it again for a while. Since
> then, the usual stream of questions about how to recover from peopl
>
> Sure. I wonder if there should be some text to replace the output
> that mentions the pack being created, though. E.g.:
>
> >
> >
> > You can then run
>
> Total 6020 (delta 4070), reused 0 (delta 0)
> --
> >
> > -Or you can use linkgit:git-name-rev[1], which will give the commit a
> > +or you can use linkgit:git-name-rev[1], which will give the commit a
>
> I think this reads better with a capital 'O'. (The pedant in me
> likes it, too, since a colon ends a sentence.)
>
> The lowercase 'but'
>
> That's a mouthful. I'd say
>
> To update the index with the contents of a new or modified file, use
>
OK; thanks! I will change this.
---
Thomas
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo
> >
> > - A "test" tree into which patches are initially placed so that they
> > can get some exposure when integrated with other ongoing development.
> > - This tree is available to Andrew for pulling into -mm whenever he
> > - wants.
>
> This drops useful information (namely, that
>
> Hm. It's been too long since I was a novice, since I find the above
> clear already.
>
OK; I will drop that patch.
---
Thomas
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kerne
>
> But is this correct? I somehow thought that we check with the
> current or the upstream.
>
You are correct. I will add this. Thanks.
---
Thomas
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at
>
> Maybe the intent is
>
> Git can help you perform a three-way merge, which can in turn be
> used for a many-way merge by repeating the merge procedure several
> times. The usual situation is that you only do one three-way merge
> (reconciling two lines of history) and
- Start list with 1 instead of 0 because ASCIIDOC will renumber it anyway
Signed-off-by: Thomas Ackermann
---
Documentation/technical/api-command.txt | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Documentation/technical/api-command.txt
b/Documentation
Signed-off-by: Thomas Ackermann
---
Documentation/technical/api-index-skel.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/Documentation/technical/api-index-skel.txt
b/Documentation/technical/api-index-skel.txt
index af7cc2e..730cfac 100644
--- a/Documentation/technical/api-index
- because it describes a different form of API than the other api-* documents
Signed-off-by: Thomas Ackermann
---
Documentation/technical/api-index.sh | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/technical/api-index.sh
b/Documentation/technical/api
OK; I would also prefer to have it in ./howto.
So please drop this patch; I will provide a new one.
- Original Nachricht
Von: Junio C Hamano
An: Thomas Ackermann
Datum: 16.12.2012 21:01
Betreff: Re: [PATCH] Move api-command.txt to the end of API list in
api-index.txt
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile | 1 -
1 file changed, 1 deletion(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 3615504..7df75d0 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -31,7 +31,6 @@ SP_ARTICLES += howto/separating
d new-command.txt to ./Documentation/Makefile
[PATCH 3/3] Amend new-command.txt to be processed correctly by howto-index.sh
Signed-off-by: Thomas Ackermann
---
Thomas
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.or
Signed-off-by: Thomas Ackermann
---
Documentation/{technical/api-command.txt => howto/new-command.txt} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename Documentation/{technical/api-command.txt => howto/new-command.txt}
(100%)
diff --git a/Documentation/technical/api-command.
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 7df75d0..f3afcb6 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -21,6 +21,7 @@ ARTICLES += git-tools
Signed-off-by: Thomas Ackermann
---
Documentation/howto/new-command.txt | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Documentation/howto/new-command.txt
b/Documentation/howto/new-command.txt
index d3b9781..36502f6 100644
--- a/Documentation/howto/new-command.txt
Howto documents in howto-index.txt were listed in a rather
random order. So better sort them.
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index d7417b8..ff8ad9a
>
> I think $(wildcard) used to sort but in recent GNU make it no longer
> does, so this is probably a good change.
>
> Do we need to explicitly sort the api-index as well? $(API_DOCS) is
> fed to the script that reads filenames one at a time in the given
> order, but I do not see anybody askin
This file is rather outdated and IMHO shouldn't be there in the first place.
(If there are translations of the Git documentation they are better be kept
separate from the original documentation.)
Signed-off-by: Thomas Ackermann
---
Documentation/pt_BR/gittutorial.txt
CodingGuidelines and SubmittingPatches are IMHO a little bit hidden in
./Documentation
and with respect to their content should be better placed in
./Documentation/technical.
[PATCH 1/3] Move CodingGuidelines to ./technical/coding-guidelines.txt and
SubmittingPatches to ./technical/submitting-
Signed-off-by: Thomas Ackermann
---
Documentation/{CodingGuidelines => technical/coding-guidelines.txt} | 0
Documentation/{SubmittingPatches => technical/submitting-patches.txt} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename Documentation/{CodingGuidelines => technic
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index e53d333..a51c00f 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -47,6 +47,8 @@ TECH_DOCS += technical/racy
Signed-off-by: Thomas Ackermann
---
Documentation/technical/coding-guidelines.txt | 175 ++---
Documentation/technical/submitting-patches.txt | 144 ++--
2 files changed, 174 insertions(+), 145 deletions(-)
diff --git a/Documentation/technical/coding
e moved to ./technical (sorry for
being the guy who just moved ./technical/api-command to
./howto/new-command.txt ;-)).
./Documentation itself should only contain the command manpages
and tutorials.
- Original Nachricht
Von: Ramkumar Ramachandra
An: Thomas Ackermann
Datum: 30.
>
> Implementation details are part of API; CG and SP are social not
> technical.
>
This depends on your definition of "social" ;-)
>
> Also CG and SP are in the part of the documents that are not
> installed for end-users and that is their right place. They matter
> only to the people who gr
Junio C Hamano pobox.com> writes:
>
> Thanks; I just realized that nothing in Documentation/ hierarchy
> mentions these; they are only mentioned in "A Note from the
> Maintainer" I send out every once in a while (kept in MaintNotes of
> 'todo' branch):
>
Wouldn't it be a good idea to put Maint
Git changed its 'official' system name from 'GIT' to 'Git' in v1.6.5.3
(as can be seen in the corresponding release note where 'GIT' was
changed to 'Git' in the header line).
Alas the documention uses 'GIT', 'Git' or even 'git' to refer to the
Git system. So change every occurrence of 'GIT" and
Signed-off-by: Thomas Ackermann
---
Documentation/asciidoc.conf | 2 +-
Documentation/everyday.txt | 4 ++--
Documentation/git-clone.txt | 2 +-
Documentation/git-cvsexportcommit.txt | 2 +-
Documentation
>
> What about GITweb?
>
You are right; I missed that because I grepped only for 'GIT' as a whole word.
'gitweb' and 'GITweb' should be changed to 'Gitweb'.
>
> IMO some of these look nicer when everything is lowercase.
> e.g. "standard git committer ident format".
>
IMHO what seems nicer he
>
> Git changed its 'official' system name from 'GIT' to 'Git' in v1.6.5.3
> (as can be seen in the corresponding release note where 'GIT' was
> changed to 'Git' in the header line).
>
> Alas the documention uses 'GIT', 'Git' or even 'git' to refer to the
> Git system. So change every occurren
W. Trevor King tremily.us> writes:
>
> I'm also surprised that I couldn't find a more obvious link to the
> manual from git-scm.com (I ended up taking a “See Also” link from
> gittutorial(7) [3]). I'm not sure if this is intentional or not,
> since git-scm.com does prominently link Pro Git, and
> > (1) Very poor html formatting (document type "book" causes
> > ugly TOCs per section and there's a "Part I" without a "Part II")
> > (2) Partly outdated content
> > (3) Sub-optimal structuring (to-do list as part of the document,
> > glossary not at the end of the document)
> > (4) User-manua
This target was only used to create user-manual.pdf with dblatex
using a separate style definition than was used for user-manual.html.
These two style definitions had to be maintained separately and
so made improvements to user-manual.html unnecessarily hard.
Signed-off-by: Thomas Ackermann
>
> I don't understand. Do you mean that you want to change the rules
> that generate user-manual.xml? Would generating different XML files
> for the PDF and for other purposes (with different names) work as a
> way to achieve that without losing the printable manual?
>
This would be even wors
>
> If I understood the original commit message correctly, you were saying
> the XML file was not suitable for html generation and you wanted to
> tweak it, and were dropping the PDF target to avoid breaking it. Now
> if I understand correctly you are saying the XML file actually *is*
> suitable
While proof-reading the user-manual I noticed some issues with
glossary-content.txt:
- There is some outdated, misleading or irrelevant information which might only
confuse
new Git users and should therefore be removed.
- The entries for object, object name and SHA1 lacked a little bit of
cons
Signed-off-by: Thomas Ackermann
---
Documentation/glossary-content.txt | 28 +---
1 file changed, 5 insertions(+), 23 deletions(-)
diff --git a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index eb7ba84..ab02238 100644
--- a/Documentation
Signed-off-by: Thomas Ackermann
---
Documentation/glossary-content.txt | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index ab02238..05bfebc 100644
--- a/Documentation/glossary-content.txt
Signed-off-by: Thomas Ackermann
---
Documentation/glossary-content.txt | 65 ++
1 file changed, 3 insertions(+), 62 deletions(-)
diff --git a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index 05bfebc..1c9c522 100644
--- a
>
> I think we can just drop "See ... for details" from here. Besides,
> why just "push" and not "fetch"?
>
I just kept the original reference which only linked to git-push.
---
Thomas
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vg
>
> The text indeed has a room for improvement, but it probably makes
> sense to have an entry for `directory` here, as folks who are used
> to say "Folders" may not know what it is.
>
I assumed the number of such people so low that it's not worth
to keep this - to most people obvious - explana
>
> That is only because the last example the "See ... for details"
> refers to is about 'git push', isn't it?
>
This is correct but there was no direct link to git-fetch in the first example
and I did not check which combination of man pages gives the complete
definition of refspecs ...
---
>
> > While proof-reading the user-manual I noticed some issues with
> glossary-content.txt:
> >
I found now mention of my patches in the latest "What's cooking".
Did I miss an action item on my side or got this lost in the noise?
---
Thomas
--
To unsubscribe from this list: send the line "un
This is a reroll of my patches for glossary-content.txt
with Junio's comments/suggestions included:
[PATCH 1/3] glossary: remove outdated/misleading/irrelevant entries
- keep entries for "directory" and "evil merge"
- keep comparison of "Git tag" to "Lisp tag"
[PATCH 2/3] glossary: improve descrip
Signed-off-by: Thomas Ackermann
---
Documentation/glossary-content.txt | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index eb7ba84..5a7a486 100644
--- a/Documentation/glossary-content.txt
Signed-off-by: Thomas Ackermann
---
Documentation/glossary-content.txt | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index 5a7a486..4dd0a52 100644
--- a/Documentation/glossary
Signed-off-by: Thomas Ackermann
---
Documentation/glossary-content.txt | 64 ++
1 file changed, 2 insertions(+), 62 deletions(-)
diff --git a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index 4dd0a52..f21678d 100644
--- a
This is another reroll of my patches for glossary-content.txt.
- The first patch is the same as in v2.
- The second patch only adds the log message which Junio suggested and a
missing full stop.
- The third patch is new and is a direct consequence of the second patch.
- In the fourth patch there
Signed-off-by: Thomas Ackermann
---
Documentation/glossary-content.txt | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index eb7ba84..5a7a486 100644
--- a/Documentation/glossary-content.txt
1 - 100 of 156 matches
Mail list logo