Junio C Hamano 8146f19762 Merge branch 'maint' ...

* maint:
  improve error message in config.c
  t4018-diff-funcname: add cpp xfuncname pattern to syntax test
  Work around BSD whose typeof(tv.tv_sec) != time_t
  git-am.txt: reword extra headers in message body
  git-am.txt: Use date or value instead of time or timestamp
  git-am.txt: add an 'a', say what 'it' is, simplify a sentence
  dir.c: Fix two minor grammatical errors in comments
  git-svn: fix a sloppy Getopt::Long usage

2009-05-05 22:52:17 -07:00

..

howto

Documentation: Typo / spelling / formatting fixes

2009-03-03 21:43:19 -08:00

technical

Merge branch 'maint'

2009-04-28 00:46:39 -07:00

.gitattributes

…

.gitignore

…

asciidoc.conf

Documentation: asciidoc.conf: fix verse block with block titles

2009-03-27 00:33:20 -07:00

blame-options.txt

Merge branch 'dm/maint-docco'

2009-03-21 23:24:46 -07:00

build-docdep.perl

…

cat-texi.perl

Fix the building of gitman.info document

2008-12-29 00:40:10 -08:00

cmd-list.perl

…

CodingGuidelines

lstat_cache(): swap func(length, string) into func(string, length)

2009-02-09 20:59:26 -08:00

config.txt

Rename core.unreliableHardlinks to core.createObject

2009-04-29 16:50:07 -07:00

diff-format.txt

Documentation: fix typos, grammar, asciidoc syntax

2008-12-19 19:10:46 -08:00

diff-generate-patch.txt

Documentation: fix typos, grammar, asciidoc syntax

2008-12-19 19:10:46 -08:00

diff-options.txt

doc: clarify how -S works

2009-03-19 02:47:40 -07:00

docbook-xsl.css

docbook: change css style

2009-04-06 00:27:09 -07:00

docbook.xsl

…

everyday.txt

everyday: use the dashless form of git-init

2009-03-22 10:33:36 -07:00

fetch-options.txt

…

fix-texi.perl

…

git-add.txt

Update git-add.txt according to the new possibilities of 'git add -p'.

2009-04-19 12:35:38 -07:00

git-am.txt

git-am.txt: reword extra headers in message body

2009-05-05 22:09:31 -07:00

git-annotate.txt

Documentation: minor grammatical fixes.

2009-03-02 12:34:54 -08:00

git-apply.txt

Documentation: minor grammatical fixes.

2009-03-02 12:34:56 -08:00

git-archimport.txt

…

git-archive.txt

archive: do not read .gitattributes in working directory

2009-04-17 21:05:49 -07:00

git-bisect.txt

Merge branch 'dm/maint-docco'

2009-03-26 00:26:04 -07:00

git-blame.txt

Documentation: minor grammatical fixes in git-blame.txt.

2009-03-17 12:08:43 -07:00

git-branch.txt

doc: refer to tracking configuration as "upstream"

2009-04-13 09:02:18 -07:00

git-bundle.txt

Documentation: minor grammatical fixes and rewording in git-bundle.txt

2009-03-22 20:59:20 -07:00

git-cat-file.txt

Documentation: minor grammatical fixes in git-cat-file.txt

2009-03-22 21:02:08 -07:00

git-check-attr.txt

Documentation: minor grammatical fixes in git-check-attr.txt

2009-03-22 21:02:38 -07:00

git-check-ref-format.txt

Merge branch 'jc/name-branch'

2009-04-06 00:43:44 -07:00

git-checkout-index.txt

…

git-checkout.txt

docs/checkout: clarify what "non-branch" means

2009-04-13 09:08:16 -07:00

git-cherry-pick.txt

…

git-cherry.txt

Documentation: clarify which parameters are optional to git-cherry

2009-01-05 11:43:28 -08:00

git-citool.txt

…

git-clean.txt

Documentation: git-clean: make description more readable

2009-04-25 09:29:38 -07:00

git-clone.txt

Merge branch 'maint-1.6.0' into maint-1.6.1

2009-04-01 22:35:57 -07:00

git-commit-tree.txt

…

git-commit.txt

Merge branch 'maint' to sync with GIT 1.6.0.6

2008-12-19 19:35:55 -08:00

git-config.txt

Merge branch 'fc/parseopt-config'

2009-03-20 14:29:03 -07:00

git-count-objects.txt

…

git-cvsexportcommit.txt

…

git-cvsimport.txt

Documentation: fix typos / spelling mistakes

2009-04-20 15:56:07 -07:00

git-cvsserver.txt

…

git-daemon.txt

Merge branch 'maint-1.6.0' into maint-1.6.1

2009-04-18 14:43:24 -07:00

git-describe.txt

Merge branch 'maint'

2009-01-23 21:51:20 -08:00

git-diff-files.txt

Documentation: let asciidoc align related options

2009-01-17 18:01:46 -08:00

git-diff-index.txt

…

git-diff-tree.txt

Documentation: fix typos, grammar, asciidoc syntax

2008-12-19 19:37:18 -08:00

git-diff.txt

…

git-difftool.txt

difftool: add support for a difftool.prompt config variable

2009-04-07 22:19:56 -07:00

git-fast-export.txt

Merge branch 'maint' to sync with GIT 1.6.0.6

2008-12-19 19:35:55 -08:00

git-fast-import.txt

…

git-fetch-pack.txt

…

git-fetch.txt

…

git-filter-branch.txt

Merge branch 'maint'

2009-04-12 16:01:25 -07:00

git-fmt-merge-msg.txt

…

git-for-each-ref.txt

for-each-ref: utilize core.warnAmbiguousRefs for :short-format

2009-04-13 09:36:52 -07:00

git-format-patch.txt

git-format-patch.txt: general rewordings and cleanups

2009-04-23 12:53:16 -07:00

git-fsck-objects.txt

…

git-fsck.txt

doc/git-fsck: change the way for getting heads' SHA1s

2008-12-21 12:04:12 -08:00

git-gc.txt

gc: make --prune useful again by accepting an optional parameter

2009-02-14 21:14:07 -08:00

git-get-tar-commit-id.txt

…

git-grep.txt

grep: color patterns in output

2009-03-07 11:34:59 -08:00

git-gui.txt

…

git-hash-object.txt

…

git-help.txt

…

git-http-fetch.txt

…

git-http-push.txt

…

git-imap-send.txt

Merge branch 'maint'

2009-04-18 14:45:59 -07:00

git-index-pack.txt

…

git-init-db.txt

…

git-init.txt

Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'

2009-04-18 12:51:06 -07:00

git-instaweb.txt

…

git-log.txt

…

git-lost-found.txt

…

git-ls-files.txt

Fix Documentation typos surrounding the word 'handful'.

2009-01-13 00:18:53 -08:00

git-ls-remote.txt

…

git-ls-tree.txt

Merge branch 'jc/maint-ls-tree'

2009-01-13 23:09:57 -08:00

git-mailinfo.txt

Documentation: fix typos, grammar, asciidoc syntax

2008-12-19 19:10:46 -08:00

git-mailsplit.txt

…

git-merge-base.txt

…

git-merge-file.txt

…

git-merge-index.txt

…

git-merge-one-file.txt

…

git-merge-tree.txt

…

git-merge.txt

Grammar fix for "git merge" man page

2009-03-26 09:38:58 -07:00

git-mergetool--lib.txt

mergetool--lib: simplify API usage by removing more global variables

2009-04-12 15:19:12 -07:00

git-mergetool.txt

difftool/mergetool: add diffuse as merge and diff tool

2009-04-07 22:19:56 -07:00

git-mktag.txt

…

git-mktree.txt

…

git-mv.txt

…

git-name-rev.txt

…

git-pack-objects.txt

…

git-pack-redundant.txt

…

git-pack-refs.txt

doc/git-pack-refs: fix two grammar issues

2009-04-05 00:39:37 -07:00

git-parse-remote.txt

…

git-patch-id.txt

Grammar fixes to "merge" and "patch-id" docs

2009-03-25 17:28:33 -07:00

git-peek-remote.txt

…

git-prune-packed.txt

…

git-prune.txt

…

git-pull.txt

…

git-push.txt

git-push.txt: describe how to default to pushing only current branch

2009-03-17 14:15:04 -07:00

git-quiltimport.txt

…

git-read-tree.txt

…

git-rebase.txt

rebase: add options passed to git-am

2009-03-18 19:25:01 -07:00

git-receive-pack.txt

Documentation: fix typos, grammar, asciidoc syntax

2008-12-19 19:10:46 -08:00

git-reflog.txt

Documentation: fix typos, grammar, asciidoc syntax

2008-12-19 19:10:46 -08:00

git-relink.txt

…

git-remote.txt

git remote update: Fallback to remote if group does not exist

2009-04-07 21:52:26 -07:00

git-repack.txt

…

git-repo-config.txt

…

git-request-pull.txt

…

git-rerere.txt

…

git-reset.txt

Merge branch 'lt/reset-merge'

2008-12-29 01:21:45 -08:00

git-rev-list.txt

…

git-rev-parse.txt

parseopt: fix documentation for --keep-dashdash

2009-04-29 16:50:10 -07:00

git-revert.txt

git-revert documentation: refer to new HOWTO on reverting faulty merges

2008-12-21 18:34:49 -08:00

git-rm.txt

…

git-send-email.txt

Add parsing of elm aliases to git-send-email

2009-04-22 19:10:41 -07:00

git-send-pack.txt

…

git-sh-setup.txt

…

git-shell.txt

git-shell: Add 'git-upload-archive' to allowed commands.

2009-04-11 11:01:15 -07:00

git-shortlog.txt

Move mailmap documentation into separate file

2009-02-08 12:38:08 -08:00

git-show-branch.txt

git-show-branch.txt: cleanup example description

2009-04-23 04:21:22 -07:00

git-show-index.txt

…

git-show-ref.txt

…

git-show.txt

…

git-stage.txt

…

git-stash.txt

…

git-status.txt

…

git-stripspace.txt

…

git-submodule.txt

submodule: add --no-fetch parameter to update command

2009-02-07 00:44:49 -08:00

git-svn.txt

Documentation: git-svn: fix a grammatical error without awkwardness

2009-04-22 18:40:33 -07:00

git-symbolic-ref.txt

…

git-tag.txt

Merge branch 'maint-1.6.1' into maint

2009-03-30 13:25:27 -07:00

git-tar-tree.txt

…

git-tools.txt

…

git-unpack-file.txt

…

git-unpack-objects.txt

…

git-update-index.txt

Documentation: fix typos, grammar, asciidoc syntax

2008-12-19 19:10:46 -08:00

git-update-ref.txt

…

git-update-server-info.txt

Remove obsolete bug warning in man git-update-server-info

2009-04-25 09:29:38 -07:00

git-upload-archive.txt

…

git-upload-pack.txt

…

git-var.txt

…

git-verify-pack.txt

…

git-verify-tag.txt

…

git-web--browse.txt

…

git-whatchanged.txt

…

git-write-tree.txt

…

git.txt

GIT 1.6.3-rc0

2009-04-12 17:05:55 -07:00

gitattributes.txt

doc/gitattributes: clarify location of config text

2009-04-17 21:28:07 -07:00

gitcli.txt

Documentation: remove extra quoting/emphasis around literal texts

2009-03-17 14:16:44 -07:00

gitcore-tutorial.txt

Fix Documentation typos surrounding the word 'handful'.

2009-01-13 00:18:53 -08:00

gitcvs-migration.txt

gitcvs-migration: Link to git-cvsimport documentation

2009-04-20 13:45:02 -07:00

gitdiffcore.txt

…

gitglossary.txt

…

githooks.txt

githooks documentation: post-checkout hook is also called after clone

2009-03-22 12:29:47 -07:00

gitignore.txt

Documentation: clarify .gitattributes search

2009-04-07 21:58:25 -07:00

gitk.txt

Documentation: Expand a couple of abbreviations

2009-03-03 21:42:44 -08:00

gitmodules.txt

…

gitrepository-layout.txt

Documentation: fix description for enabling hooks

2008-12-17 00:57:33 -08:00

gittutorial-2.txt

tutorial-2: Update with the new "git commit" ouput

2009-01-21 00:15:34 -08:00

gittutorial.txt

gittutorial: remove misleading note

2009-01-25 18:57:26 -08:00

gitworkflows.txt

…

glossary-content.txt

Documentation: Introduce "upstream branch"

2009-04-07 22:04:41 -07:00

howto-index.sh

…

i18n.txt

Merge branch 'maint' to sync with GIT 1.6.0.6

2008-12-19 19:35:55 -08:00

install-doc-quick.sh

…

install-webdoc.sh

…

mailmap.txt

Documentation: minor grammatical fixes in git-blame.txt.

2009-03-17 12:08:43 -07:00

Makefile

doc: consistently use ASCIIDOC_EXTRA

2009-04-28 11:50:18 -07:00

manpage-1.72.xsl

Documentation: move quieting params into manpage-base.xsl

2009-03-27 00:33:19 -07:00

manpage-base.xsl

Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set

2009-04-01 11:02:42 -07:00

manpage-bold-literal.xsl

Documentation: option to render literal text as bold for manpages

2009-03-27 00:33:20 -07:00

manpage-normal.xsl

Documentation: move "spurious .sp" code into manpage-base.xsl

2009-03-27 00:33:19 -07:00

manpage-suppress-sp.xsl

Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set

2009-04-01 11:02:42 -07:00

merge-config.txt

difftool/mergetool: add diffuse as merge and diff tool

2009-04-07 22:19:56 -07:00

merge-options.txt

…

merge-strategies.txt

Grammar fixes to "merge" and "patch-id" docs

2009-03-25 17:28:33 -07:00

pretty-formats.txt

pretty.c: add %f format specifier to format_commit_message()

2009-03-22 21:32:13 -07:00

pretty-options.txt

Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit"

2009-02-24 23:53:40 -08:00

pull-fetch-param.txt

Documentation: simplify refspec format description

2009-01-25 22:25:20 -08:00

RelNotes-1.5.0.1.txt

…

RelNotes-1.5.0.2.txt

…

RelNotes-1.5.0.3.txt

…

RelNotes-1.5.0.4.txt

…

RelNotes-1.5.0.5.txt

…

RelNotes-1.5.0.6.txt

…

RelNotes-1.5.0.7.txt

…

RelNotes-1.5.0.txt

…

RelNotes-1.5.1.1.txt

…

RelNotes-1.5.1.2.txt

…

RelNotes-1.5.1.3.txt

…

RelNotes-1.5.1.4.txt

…

RelNotes-1.5.1.5.txt

…

RelNotes-1.5.1.6.txt

…

RelNotes-1.5.1.txt

…

RelNotes-1.5.2.1.txt

…

RelNotes-1.5.2.2.txt

Documentation: Typos / spelling fixes in RelNotes

2009-03-03 21:40:36 -08:00

RelNotes-1.5.2.3.txt

…

RelNotes-1.5.2.4.txt

…

RelNotes-1.5.2.5.txt

…

RelNotes-1.5.2.txt

…

RelNotes-1.5.3.1.txt

…

RelNotes-1.5.3.2.txt

…

RelNotes-1.5.3.3.txt

…

RelNotes-1.5.3.4.txt

…

RelNotes-1.5.3.5.txt

…

RelNotes-1.5.3.6.txt

…

RelNotes-1.5.3.7.txt

…

RelNotes-1.5.3.8.txt

…

RelNotes-1.5.3.txt

…

RelNotes-1.5.4.1.txt

…

RelNotes-1.5.4.2.txt

…

RelNotes-1.5.4.3.txt

…

RelNotes-1.5.4.4.txt

…

RelNotes-1.5.4.5.txt

…

RelNotes-1.5.4.6.txt

…

RelNotes-1.5.4.7.txt

GIT 1.5.4.7

2008-12-16 22:06:47 -08:00

RelNotes-1.5.4.txt

…

RelNotes-1.5.5.1.txt

…

RelNotes-1.5.5.2.txt

…

RelNotes-1.5.5.3.txt

…

RelNotes-1.5.5.4.txt

…

RelNotes-1.5.5.5.txt

…

RelNotes-1.5.5.6.txt

GIT 1.5.5.6

2008-12-16 22:08:28 -08:00

RelNotes-1.5.5.txt

…

RelNotes-1.5.6.1.txt

…

RelNotes-1.5.6.2.txt

…

RelNotes-1.5.6.3.txt

…

RelNotes-1.5.6.4.txt

…

RelNotes-1.5.6.5.txt

…

RelNotes-1.5.6.6.txt

GIT 1.5.6.6

2008-12-16 22:13:36 -08:00

RelNotes-1.5.6.txt

…

RelNotes-1.6.0.1.txt

…

RelNotes-1.6.0.2.txt

Documentation: Typos / spelling fixes in RelNotes

2009-03-03 21:40:36 -08:00

RelNotes-1.6.0.3.txt

…

RelNotes-1.6.0.4.txt

…

RelNotes-1.6.0.5.txt

…

RelNotes-1.6.0.6.txt

GIT 1.6.0.6

2008-12-19 19:27:35 -08:00

RelNotes-1.6.0.txt

…

RelNotes-1.6.1.1.txt

Documentation: Typos / spelling fixes in RelNotes

2009-03-03 21:40:36 -08:00

RelNotes-1.6.1.2.txt

Documentation: Typos / spelling fixes in RelNotes

2009-03-03 21:40:36 -08:00

RelNotes-1.6.1.3.txt

GIT 1.6.1.3

2009-02-07 00:51:47 -08:00

RelNotes-1.6.1.4.txt

GIT 1.6.1.4

2009-05-03 15:29:31 -07:00

RelNotes-1.6.1.txt

GIT 1.6.1

2008-12-24 19:41:08 -08:00

RelNotes-1.6.2.1.txt

GIT 1.6.2.1

2009-03-15 13:05:05 -07:00

RelNotes-1.6.2.2.txt

GIT 1.6.2.2

2009-04-02 12:34:16 -07:00

RelNotes-1.6.2.3.txt

GIT 1.6.2.3

2009-04-12 15:57:58 -07:00

RelNotes-1.6.2.4.txt

GIT 1.6.2.4

2009-04-19 17:34:26 -07:00

RelNotes-1.6.2.5.txt

GIT 1.6.2.5

2009-05-03 16:54:14 -07:00

RelNotes-1.6.2.txt

GIT 1.6.2

2009-03-03 23:37:19 -08:00

RelNotes-1.6.3.txt

GIT 1.6.3-rc4

2009-05-01 23:31:00 -07:00

rev-list-options.txt

git-rev-list.txt: make ascii markup uniform with other pages.

2009-04-07 22:08:13 -07:00

SubmittingPatches

SubmittingPatches: itemize and reflect upon well written changes

2009-04-28 00:40:00 -07:00

urls-remotes.txt

…

urls.txt

urls.txt: document optional port specification in git URLS

2009-02-04 13:06:06 -08:00

user-manual.conf

…

user-manual.txt

user-manual: the name of the hash function is SHA-1, not sha1

2009-04-06 00:37:34 -07:00