delta/git.git/Documentation/technical, branch wd/userdiff-css

Merge branch 'jc/linkgit-fix' into maint

2016-05-26T20:17:26+00:00

Many 'linkgit:' references were broken,
which are all fixed with this.

* jc/linkgit-fix:
  Documentation: fix linkgit references

Merge branch 'lp/typofixes' into maint

2016-05-26T20:17:21+00:00

Typofixes.

* lp/typofixes:
  typofix: assorted typofixes in comments, documentation and messages

Documentation: fix linkgit references

2016-05-09T22:44:14+00:00

There are a handful of incorrect "linkgit:[]"
instances in our documentation set.

 * Some have an extra colon after "linkgit:"; fix them by removing
   the extra colon;

 * Some refer to a page outside the Git suite, namely curl(1); fix
   them by using the `curl(1)` that already appears on the same page
   for the same purpose of referring the readers to its manual page.

 * Some spell the name of the page incorrectly, e.g. "rev-list" when
   they mean "git-rev-list"; fix them.

 * Some list the manual section incorrectly; fix them to make sure
   they match what is at the top of the target of the link.

Signed-off-by: Junio C Hamano

typofix: assorted typofixes in comments, documentation and messages

2016-05-06T20:16:37+00:00

Many instances of duplicate words (e.g. "the the path") and
a few typoes are fixed, originally in multiple patches.

    wildmatch: fix duplicate words of "the"
    t: fix duplicate words of "output"
    transport-helper: fix duplicate words of "read"
    Git.pm: fix duplicate words of "return"
    path: fix duplicate words of "look"
    pack-protocol.txt: fix duplicate words of "the"
    precompose-utf8: fix typo of "sequences"
    split-index: fix typo
    worktree.c: fix typo
    remote-ext: fix typo
    utf8: fix duplicate words of "the"
    git-cvsserver: fix duplicate words

Signed-off-by: Li Peng 
Signed-off-by: Junio C Hamano

Merge branch 'jk/check-repository-format' into maint

2016-05-02T21:24:04+00:00

The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.

* jk/check-repository-format:
  verify_repository_format: mark messages for translation
  setup: drop repository_format_version global
  setup: unify repository version callbacks
  init: use setup.c's repo version verification
  setup: refactor repo format reading and verification
  config: drop git_config_early
  check_repository_format_gently: stop using git_config_early
  lazily load core.sharedrepository
  wrap shared_repository global in get/set accessors
  setup: document check_repository_format()

Merge branch 'ep/trace-doc-sample-fix' into maint

2016-04-29T21:16:00+00:00

Fix a typo in an example in the trace API documentation.

* ep/trace-doc-sample-fix:
  api-trace.txt: fix typo

Merge branch 'pb/opt-cmdmode-doc' into maint

2016-04-15T01:37:13+00:00

Minor API documentation update.

* pb/opt-cmdmode-doc:
  api-parse-options.txt: document OPT_CMDMODE()

api-trace.txt: fix typo

2016-04-05T20:51:25+00:00

The correct api is trace_printf_key(), not trace_print_key().

Also do not throw a random string at printf(3)-like function;
instead, feed it as a parameter that is fed to a "%s" conversion
specifier.

Signed-off-by: Elia Pinto 
Signed-off-by: Junio C Hamano

api-parse-options.txt: document OPT_CMDMODE()

2016-03-25T20:17:43+00:00

OPT_CMDMODE mechanism was introduced in the release of 1.8.5 to actively
notice when multiple "operation mode" options that specify mutually
incompatible operation modes are given.

Signed-off-by: Pranit Bauva 
Signed-off-by: Junio C Hamano

config: drop git_config_early

2016-03-11T23:02:23+00:00

There are no more callers, and it's a rather confusing
interface. This could just be folded into
git_config_with_options(), but for the sake of readability,
we'll leave it as a separate (static) helper function.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano