Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-19Merge branch 'ew/doc-split-pack-disables-bitmap' into HEADJunio C Hamano
Doc update. * ew/doc-split-pack-disables-bitmap: pack-objects: warn on split packs disabling bitmaps
2016-05-19Merge branch 'rn/glossary-typofix' into HEADJunio C Hamano
* rn/glossary-typofix: Documentation: fix typo 'In such these cases'
2016-05-19Merge branch 'sb/config-exit-status-list' into HEADJunio C Hamano
Doc update. * sb/config-exit-status-list: config doc: improve exit code listing
2016-05-19Merge branch 'ls/travis-submitting-patches' into HEADJunio C Hamano
* ls/travis-submitting-patches: Documentation: add setup instructions for Travis CI
2016-05-07Almost ready for 2.8.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-07Merge branch 'kn/for-each-tag-branch' into maintJunio C Hamano
A minor documentation update. * kn/for-each-tag-branch: for-each-ref: fix description of '--contains' in manpage
2016-05-03Start preparing for 2.8.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-03Merge branch 'es/format-patch-doc-hide-no-patch' into maintJunio C Hamano
"git format-patch --help" showed `-s` and `--no-patch` as if these are valid options to the command. We already hide `--patch` option from the documentation, because format-patch is about showing the diff, and the documentation now hides these options as well. * es/format-patch-doc-hide-no-patch: git-format-patch.txt: don't show -s as shorthand for multiple options
2016-05-03Merge branch 'jk/check-repository-format' into maintJunio C Hamano
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()
2016-05-02Documentation: fix typo 'In such these cases'René Nyffenegger
Signed-off-by: René Nyffenegger <mail@renenyffenegger.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-02Documentation: add setup instructions for Travis CILars Schneider
Also change UK english "behaviour" to US english "behavior". Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-04-30Git 2.8.2v2.8.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-04-30Merge branch 'ep/trace-doc-sample-fix' into maintJunio C Hamano
Fix a typo in an example in the trace API documentation. * ep/trace-doc-sample-fix: api-trace.txt: fix typo
2016-04-28pack-objects: warn on split packs disabling bitmapsEric Wong
It can be tempting for a server admin to want a stable set of long-lived packs for dumb clients; but also want to enable bitmaps to serve smart clients more quickly. Unfortunately, such a configuration is impossible; so at least warn users of this incompatibility since commit 21134714 (pack-objects: turn off bitmaps when we split packs, 2014-10-16). Tested the warning by inspecting the output of: make -C t t5310-pack-bitmaps.sh GIT_TEST_OPTS=-v Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-04-26config doc: improve exit code listingStefan Beller
The possible reasons for exiting are now ordered by the exit code value. While at it, rewrite the `can not write to the config file` to `the config file cannot be written` to be grammatically correct and a proper sentence. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-04-15Prepare for 2.8.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-04-15Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano
Fetching of history by naming a commit object name directly didn't work across remote-curl transport. * gf/fetch-pack-direct-object-fetch: fetch-pack: update the documentation for "<refs>..." arguments fetch-pack: fix object_id of exact sha1
2016-04-15Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano
"git config --get-urlmatch", unlike other variants of the "git config --get" family, did not signal error with its exit status when there was no matching configuration. * jk/config-get-urlmatch: Documentation/git-config: fix --get-all description Documentation/git-config: use bulleted list for exit codes config: fail if --get-urlmatch finds no value
2016-04-15Merge branch 'oa/doc-diff-check' into maintJunio C Hamano
A minor documentation update. * oa/doc-diff-check: Documentation: git diff --check detects conflict markers
2016-04-15Merge branch 'pb/opt-cmdmode-doc' into maintJunio C Hamano
Minor API documentation update. * pb/opt-cmdmode-doc: api-parse-options.txt: document OPT_CMDMODE()
2016-04-15Merge branch 'nd/apply-doc' into maintJunio C Hamano
A minor documentation update. * nd/apply-doc: git-apply.txt: mention the behavior inside a subdir git-apply.txt: remove a space
2016-04-15Merge branch 'cc/doc-recommend-performance-trace-to-file' into maintJunio C Hamano
A minor documentation update. * cc/doc-recommend-performance-trace-to-file: Documentation: talk about pager in api-trace.txt
2016-04-14Start preparing for 2.8.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-04-05api-trace.txt: fix typoElia Pinto
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 <gitter.spiros@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-04-04git-format-patch.txt: don't show -s as shorthand for multiple optionsEric Sunshine
git-format-patch recognizes -s as shorthand only for --signoff, however, its documentation shows -s as shorthand for both --signoff and --no-patch. Resolve this confusion by suppressing the bogus -s shorthand for --no-patch. While here, also avoid showing the --no-patch option in git-format-patch documentation since it doesn't make sense to ask to suppress the patch while at the same time explicitly asking to format the patch (which, after all, is the purpose of git-format-patch). Reported-by: Kevin Brodsky <corax26@gmail.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-04-03Git 2.8.1v2.8.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-30for-each-ref: fix description of '--contains' in manpageSZEDER Gábor
'git for-each-ref's manpage says that '--contains' only lists tags, but it lists all kinds of refs. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-29Documentation: git diff --check detects conflict markersOri Avtalion
Signed-off-by: Ori Avtalion <ori@avtalion.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-28Git 2.8v2.8.0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-25api-parse-options.txt: document OPT_CMDMODE()Pranit Bauva
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 <pranit.bauva@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-24Merge branch 'ls/p4-doc-markup'Junio C Hamano
* ls/p4-doc-markup: Documentation: fix git-p4 AsciiDoc formatting Documentation: use ASCII quotation marks in git-p4
2016-03-24git-apply.txt: mention the behavior inside a subdirNguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-24git-apply.txt: remove a spaceNguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-23Documentation: fix git-p4 AsciiDoc formattingLars Schneider
Noticed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-21Sync with maintJunio C Hamano
* maint: Documentation: fix broken linkgit to git-config git-compat-util: st_add4: work around gcc 4.2.x compiler crash
2016-03-21Merge branch 'mm/doc-hooks-linkgit-fix' into maintJunio C Hamano
* mm/doc-hooks-linkgit-fix: Documentation: fix broken linkgit to git-config
2016-03-21Documentation: fix broken linkgit to git-configMatthieu Moy
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-21Documentation: use ASCII quotation marks in git-p4Lars Schneider
Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-18RelNotes: remove the mention of !reinclusionJunio C Hamano
We will be postponing this to a later cycle. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-18Revert "Merge branch 'nd/exclusion-regression-fix'"Junio C Hamano
This reverts commit 5e57f9c3dfe7dd44a1b56bb5b3327d7a1356ec7c, reversing changes made to e79112d21024beb997951381db21a70b087d459d. We will be postponing nd/exclusion-regression-fix topic to later cycle.
2016-03-18Revert "Merge branch 'jc/exclusion-doc'"Junio C Hamano
This reverts commit e80aae51f2be908e37fca47ea0dff6d7861c8497, reversing changes made to 68846a92eafa6b2bfae778d0a656443a9fa61e59. We will be postponing nd/exclusion-regression-fix topic to later cycle.
2016-03-17Sync with Git 2.7.4Junio C Hamano
* maint: Git 2.7.4 Git 2.6.6 Git 2.5.5 Git 2.4.11
2016-03-17Git 2.7.4v2.7.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-17Sync with Git 2.6.6Junio C Hamano
* maint-2.6: Git 2.6.6 Git 2.5.5 Git 2.4.11
2016-03-17Git 2.6.6v2.6.6Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-17Merge branch 'maint-2.5' into maint-2.6Junio C Hamano
* maint-2.5: Git 2.5.5 Git 2.4.11 list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow
2016-03-17Git 2.5.5v2.5.5Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-17Merge branch 'maint-2.4' into maint-2.5Junio C Hamano
* maint-2.4: Git 2.4.11 list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow
2016-03-17Git 2.4.11v2.4.11Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-17Git 2.8-rc3v2.8.0-rc3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>