summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | doc: gitrevisions - clarify 'latter case' is revision walkPhilip Oakley2016-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prior sentence has too many clauses for easy parsing. Replace 'the latter case' with a direct quote. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | doc: gitrevisions - use 'reachable' in page descriptionPhilip Oakley2016-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | doc: revisions: single vs multi-parent notation comparisonPhilip Oakley2016-08-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | doc: revisions: extra clarification of <rev>^! notation effectsPhilip Oakley2016-08-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | doc: revisions: give headings for the two and three dot notationsPhilip Oakley2016-08-121-22/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While there, also break out the other shorthand notations and add a title for the revision range summary (which also appears in git-rev-parse, so keep it mixed case). We do not quote the notation within the headings as the asciidoc -> docbook -> groff man viewer toolchain, particularly the docbook-groff step, does not cope with two font changes, failing to return the heading font to bold after the quotation of the notation. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | doc: show the actual left, right, and boundary marksPhilip Oakley2016-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | doc: revisions - name the left and right sidesPhilip Oakley2016-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The terms left and right side originate from the symmetric difference. Name them there. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | doc: use 'symmetric difference' consistentlyPhilip Oakley2016-07-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge tag 'l10n-2.10.0-rnd2.3' of git://github.com/git-l10n/git-po into maintJunio C Hamano2016-09-123-446/+402
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n-2.10.0-rnd2.3 * tag 'l10n-2.10.0-rnd2.3' of git://github.com/git-l10n/git-po: l10n: zh_CN: review for git v2.10.0 l10n l10n: zh_CN: fixed some typos for git 2.10.0 l10n: pt_PT: update Portuguese repository info l10n: pt_PT: update Portuguese translation
| * | | | | l10n: zh_CN: review for git v2.10.0 l10nRay Chen2016-09-111-50/+50
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ray Chen <oldsharp@gmail.com>
| * | | | | l10n: zh_CN: fixed some typos for git 2.10.0Jiang Xin2016-09-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Ray <tvvocold@163.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | | | | l10n: pt_PT: update Portuguese repository infoVasco Almeida2016-09-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Portuguese l10n leadership to Vasco Almeida. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
| * | | | | l10n: pt_PT: update Portuguese translationVasco Almeida2016-09-031-392/+347
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
* | | | | | Start maintenance track for 2.10.x seriesJunio C Hamano2016-09-08303-18845/+35770
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Git 2.10v2.10.0Junio C Hamano2016-09-022-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Merge tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-poJunio C Hamano2016-09-021-374/+317
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n-2.10.0-rnd2.2 * tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-po: l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)
| | * | | | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2016-09-021-374/+317
| | |\ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 'master' of https://github.com/vnwildman/git: l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)
| | * | | | l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)Tran Ngoc Quan2016-08-281-374/+317
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
| * | | | | A few more fixes before the final 2.10Junio C Hamano2016-08-311-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Merge tag 'l10n-2.10.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2016-08-318-14691/+24337
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n-2.10.0-rnd2 * tag 'l10n-2.10.0-rnd2' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.10.0 l10n round 2 l10n: ca.po: update translation l10n: fr.po v2.10.0-rc2 l10n: sv.po: Update Swedish translation (2757t0f0u) l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed) l10n: Updated Vietnamese translation for v2.10.0 (2789t) l10n: pt_PT: update Portuguese translation l10n: pt_PT: merge git.pot l10n: ko.po: Update Korean translation l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)
| | * | | | | l10n: zh_CN: for git v2.10.0 l10n round 2Jiang Xin2016-08-311-1755/+2746
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 215 translations (2757t0f0u) for git v2.10.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| | * | | | | l10n: ca.po: update translationAlex Henrie2016-08-281-2262/+3751
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
| | * | | | | l10n: fr.po v2.10.0-rc2Jean-Noel Avila2016-08-281-1796/+3072
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
| | * | | | | l10n: sv.po: Update Swedish translation (2757t0f0u)Peter Krefting2016-08-271-1791/+3043
| | |/ / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| | * | | | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2016-08-271-1780/+3085
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of https://github.com/vnwildman/git: l10n: Updated Vietnamese translation for v2.10.0 (2789t)
| | | * | | | l10n: Updated Vietnamese translation for v2.10.0 (2789t)Tran Ngoc Quan2016-08-271-1780/+3085
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
| | * | | | | l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)Jiang Xin2016-08-271-342/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate po/git.pot from v2.10.0-rc2 for git v2.10.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| | * | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2016-08-273-5296/+8782
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/git-l10n/git-po: l10n: pt_PT: update Portuguese translation l10n: pt_PT: merge git.pot l10n: ko.po: Update Korean translation l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)
| | | * | | | l10n: pt_PT: update Portuguese translationVasco Almeida2016-08-251-428/+507
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
| | | * | | | l10n: pt_PT: merge git.potVasco Almeida2016-08-251-1793/+3017
| | | |/ / / | | | | | | | | | | | | | | | | | | Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
| | | * | | l10n: ko.po: Update Korean translationChangwoo Ryu2016-08-221-1757/+2908
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Changwoo Ryu <cwryu@debian.org>
| | | * | | l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)Jiang Xin2016-08-151-1712/+2744
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate po/git.pot from v2.10.0-rc0 for git v2.10.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | | | | Merge branch 'ls/packet-line-protocol-doc-fix'Junio C Hamano2016-08-311-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct an age-old calco (is that a typo-like word for calc) in the documentation. * ls/packet-line-protocol-doc-fix: pack-protocol: fix maximum pkt-line size
| * \ \ \ \ \ Merge branch 'mh/blame-worktree'Junio C Hamano2016-08-312-1/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mh/blame-worktree: blame: fix segfault on untracked files
| | * | | | | | blame: fix segfault on untracked filesmh/blame-worktreeThomas Gummerer2016-08-292-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 3b75ee9 ("blame: allow to blame paths freshly added to the index", 2016-07-16) git blame also looks at the index to determine if there is a file that was freshly added to the index. cache_name_pos returns -pos - 1 in case there is no match is found, or if the name matches, but the entry has a stage other than 0. As git blame should work for unmerged files, it uses strcmp to determine whether the name of the returned position matches, in which case the file exists, but is merely unmerged, or if the file actually doesn't exist in the index. If the repository is empty, or if the file would lexicographically be sorted as the last file in the repository, -cache_name_pos - 1 is outside of the length of the active_cache array, causing git blame to segfault. Guard against that, and die() normally to restore the old behaviour. Reported-by: Simon Ruderich <simon@ruderich.org> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | Merge branch 'kw/patch-ids-optim'Junio C Hamano2016-08-311-0/+0
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * kw/patch-ids-optim: p3400: make test script executable
| | * | | | | | p3400: make test script executablekw/patch-ids-optimRené Scharfe2016-08-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | Git 2.10-rc2v2.10.0-rc2Junio C Hamano2016-08-262-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | gitattributes: Document the unified "auto" handlingTorsten Bögershausen2016-08-261-34/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the documentation about text=auto: text=auto now follows the core.autocrlf handling when files are not normalized in the repository. For a cross platform project recommend the usage of attributes for line-ending conversions. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | Prepare for 2.10.0-rc2Junio C Hamano2016-08-251-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | Merge branch 'ja/i18n'Junio C Hamano2016-08-253-71/+20
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recent i18n patch we added during this cycle did a bit too much refactoring of the messages to avoid word-legos; the repetition has been reduced to help translators. * ja/i18n: i18n: simplify numeric error reporting i18n: fix git rebase interactive commit messages i18n: fix typos for translation
| | * | | | | | | i18n: simplify numeric error reportingja/i18nJean-Noel Avila2016-08-241-28/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | * | | | | | | i18n: fix git rebase interactive commit messagesJean-Noel Avila2016-08-241-42/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For proper i18n, the logic cannot embed english specific processing. Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | * | | | | | | i18n: fix typos for translationJean-Noel Avila2016-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'Junio C Hamano2016-08-256-1/+35
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tempfile (hence its user lockfile) API lets the caller to open a file descriptor to a temporary file, write into it and then finalize it by first closing the filehandle and then either removing or renaming the temporary file. When the process spawns a subprocess after obtaining the file descriptor, and if the subprocess has not exited when the attempt to remove or rename is made, the last step fails on Windows, because the subprocess has the file descriptor still open. Open tempfile with O_CLOEXEC flag to avoid this (on Windows, this is mapped to O_NOINHERIT). * bw/mingw-avoid-inheriting-fd-to-lockfile: mingw: ensure temporary file handles are not inherited by child processes t6026-merge-attr: child processes must not inherit index.lock handles
| * \ \ \ \ \ \ \ \ Merge branch 'dg/document-git-c-in-git-config-doc'Junio C Hamano2016-08-251-0/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "git -c var[=val] cmd" facility to append a configuration variable definition at the end of the search order was described in git(1) manual page, but not in git-config(1), which was more likely place for people to look for when they ask "can I make a one-shot override, and if so how?" * dg/document-git-c-in-git-config-doc: doc: mention `git -c` in git-config(1)
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/no-html-bypass-on-windows'Junio C Hamano2016-08-253-52/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, help.browser configuration variable used to be ignored, which has been corrected. * js/no-html-bypass-on-windows: Revert "display HTML in default browser using Windows' shell API"
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'hv/doc-commit-reference-style'Junio C Hamano2016-08-251-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A small doc update. * hv/doc-commit-reference-style: SubmittingPatches: document how to reference previous commits
| * | | | | | | | | | | | git ls-files: text=auto eol=lf is supported in Git 2.10Torsten Bögershausen2016-08-251-2/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The man page for `git ls-files --eol` mentions the combination of text attributes "text=auto eol=lf" or "text=auto eol=crlf" as not supported yet, but may be in the future. Now they are supported. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | | | | | Git 2.10-rc1v2.10.0-rc1Junio C Hamano2016-08-192-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>