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
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/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
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.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
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/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
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/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
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
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
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
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
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
/ "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
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
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
- 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
> > 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
>
> 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
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'
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
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
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
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
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
"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
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
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-
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
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
"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 | 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
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
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
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
>
> 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
>
> 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
>
> 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
> >
> > - 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
>
> 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
> >
> > -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'
>
> 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)
> --
>
> 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
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
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
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
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
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-
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
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
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
"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 | 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
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 | 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
/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
>
> 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
>
> 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
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
> > (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
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
>
> But I do not know if the description of the longhand ":(top)" is
> unnecessary for the user. Is the equivalence between it and :/
> described anywhere else in our documentation set?
>
The only complete "documentation" for all of this is in setup.c and I must
confess that I missed the subtl
l only
be wortwhile when there's more to say about it. So for the time being
just improve the first sentence a little bit; fix the idendation of
the first paragraph after the bullet list and remove the one-item
list of magic signatures with its - for the user - unnecessary
introduction
Use "SHA-1" instead of "SHA1" whenever we talk about the hash function.
When used as a programming symbol, we keep "SHA1".
Signed-off-by: Thomas Ackermann
---
Documentation/config.txt | 2 +-
Documentation/git-cat-file.t
nique identifier for the contents
stored in the object is.
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
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
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 | 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
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 | 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
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
>
> > 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
>
> 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 ...
---
>
> 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
>
> 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
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
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 | 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
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
Nguyễn Thái Ngọc Duy gmail.com> writes:
>
> I just realized that many of my big repos are still on index v2 while
> v4 should reduce its size significantly (3.8M -> 2.9M for linux-2.6
> and 25M -> 14M for webkit, for example). I wanted to propose index v4
> as the new default version, because I
>
> Presumably the first "The" should be dropped from either the link or
> the surrounding text.
>
> Doubled 'The'.
>
You are right. I missed that; sorry.
>
> Isn't the old title more informative?
>
Yes; but every other link just uses the shorter version "Everyday Git".
---
Thomas
--
To uns
Signed-off-by: Thomas Ackermann
---
Documentation/git.txt | 2 +-
Documentation/gitcore-tutorial.txt | 6 +++---
Documentation/gittutorial-2.txt| 2 +-
Documentation/gittutorial.txt | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git.txt
Signed-off-by: Thomas Ackermann
---
Documentation/glossary-content.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index 7c15bc0..ddf2f66 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation
Signed-off-by: Thomas Ackermann
---
Documentation/git-p4.txt| 4 ++--
Documentation/git-remote-fd.txt | 2 +-
Documentation/gittutorial.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 1d1b020..3417cb3
Signed-off-by: Thomas Ackermann
---
Documentation/git-tools.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt
index 338986a..ad8b823 100644
--- a/Documentation/git-tools.txt
+++ b/Documentation/git-tools.txt
Found by Junio:
Change git-dir to $GIT_DIR and git-file to gitfile.
Signed-off-by: Thomas Ackermann
---
Documentation/git-rev-parse.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index c743469
Found by David and Junio:
Inconsistent quoting within config.txt should be fixed in a separate patch.
Signed-off-by: Thomas Ackermann
---
Documentation/config.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index
>
> I think we have waited long enough and as far as I recall we didn't
> see any reports of misconversion or forgotten conversion, so I'll
> squash the fixes parked on the topic branch, whose tip is at
> bfb8e1eb6375afb (fixup! Change 'git' to 'Git' whenever the whole
> system is referred to #4,
>
> Thomas, I do not want to see many rounds of entire rerolls of this
> series on the list (nobody will look at the whole series multiple
> times with fine toothed comb). I do not think you want to do that
> either. Can you collect remaining fixups like David's message, turn
> them into patch
>
> I left this as-is in my "fixup" commit, as the html and manpage
> backends seem to typeset the section titles differently. I however
> have to wonder what the result will look like if we replaced it with
>
> Typical use of Git credential
>
> Can you try and see how well it works?
>
>
> I think it misses "GIT - the stupid content tracker" in README, but
> probably it is OK (it is not an end-user facing documentation).
>
I only checked ./Documentation; but this should be changed also.
> I noticed that these two places still use poor-man's small caps
> after this patch.
>
Th
Signed-off-by: Thomas Ackermann
---
Documentation/CodingGuidelines | 6 ++
1 file changed, 6 insertions(+)
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 5e60daf..4f40b44 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
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). So change every occurrence
of 'GIT" in the documention to
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
Please ignore these series ... there are still problems with the size of the
patches :-|
- Original Nachricht
Von: Thomas Ackermann
An: gits...@pobox.com, th.ac...@arcor.de
Datum: 21.01.2013 19:36
Betreff: [PATCH v2 0/6] GIT, Git, git
> Git changed its 'official
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). So change every occurrence
of 'GIT" in the documention to
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 '
>
> If I were to decide today to change the spellings, with an explicit
> purpose of making things more consistent across documentation, it
> may make sense to use even a simpler rule that is less error-prone
> for people who write new sentences that has to have the word. How
> about treating it
1 - 100 of 156 matches
Mail list logo