Skip to main content

Browse the archive

swh:1:snp:87728f882295b5ba27035837248a04c5be121c53
sort by:
Revision Author Date Message Commit Date
5d826e9 Junio C Hamano 09 December 2018, 04:16:21 UTC Git 2.20 Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 December 2018, 04:16:21 UTC
b5796d9 Junio C Hamano 09 December 2018, 04:11:36 UTC Merge tag 'l10n-2.20.0-rnd3' of https://github.com/git-l10n/git-po l10n-2.20.0-rnd3 * tag 'l10n-2.20.0-rnd3' of https://github.com/git-l10n/git-po: (22 commits) l10n: de.po: fix two messages l10n: zh_CN: for git v2.20.0 l10n round 1 to 3 l10n: update German translation l10n: bg.po: Updated Bulgarian translation (4187t) l10n: sv.po: Update Swedish translation (4187t0f0u) l10n: fr.po v2.20.0 round 3 l10n: vi(4187t): Updated Vietnamese translation for v2.20.0 rd3 l10n: es.po v2.20.0 round 3 l10n: git.pot: v2.20.0 round 3 (5 new, 3 removed) l10n: vi(4185t): Updated Vietnamese translation for v2.20.0 l10n: es.po v2.20.0 round 1 l10n: bg.po: Updated Bulgarian translation (4185t) l10n: git.pot: v2.20.0 round 2 (2 new, 2 removed) l10n: bg.po: Updated Bulgarian translation (4185t) l10n: sv.po: Update Swedish translation (4185t0f0u) l10n: fr.po v2.20 rnd 1 l10n: Update Catalan translation l10n: git.pot: v2.20.0 round 1 (254 new, 27 removed) l10n: Update Catalan translation l10n: vi.po: fix typo in pack-objects ... 09 December 2018, 04:11:36 UTC
0688c55 Ralf Thielow 07 December 2018, 18:43:07 UTC l10n: de.po: fix two messages Reported-by: Phillip Szelat <phillip.szelat@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> 07 December 2018, 18:43:07 UTC
4c27fcb Jiang Xin 20 November 2018, 02:18:06 UTC l10n: zh_CN: for git v2.20.0 l10n round 1 to 3 Translate 257 new messages (4187t0f0u) for git 2.20.0. Reviewed-by: Zhou Fangyi <fangyi.zhou@yuriko.moe> Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 06 December 2018, 08:00:29 UTC
cf4c0c2 Ralf Thielow 06 December 2018, 06:44:41 UTC l10n: update German translation Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> 06 December 2018, 06:44:41 UTC
965798d Junio C Hamano 04 December 2018, 03:49:50 UTC Merge branch 'es/format-patch-range-diff-fix-fix' * es/format-patch-range-diff-fix-fix: range-diff: always pass at least minimal diff options 04 December 2018, 03:49:50 UTC
5335669 Junio C Hamano 04 December 2018, 03:49:39 UTC Merge branch 'en/rebase-consistency' * en/rebase-consistency: rebase docs: fix incorrect format of the section Behavioral Differences 04 December 2018, 03:49:39 UTC
6fcbad8 Johannes Sixt 03 December 2018, 17:34:49 UTC rebase docs: fix incorrect format of the section Behavioral Differences The text body of section Behavioral Differences is typeset as code, but should be regular text. Remove the indentation to achieve that. While here, prettify the language: - use "the x backend" instead of "x-based rebase"; - use present tense instead of future tense; and use subsections instead of a list. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 December 2018, 02:50:52 UTC
7e75a63 Martin Ågren 03 December 2018, 20:21:51 UTC RelNotes 2.20: drop spurious double quote We have three double-quote characters, which is one too many or too few. Dropping the last one seems to match the original intention best. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 December 2018, 02:26:40 UTC
7a49e44 Martin Ågren 03 December 2018, 20:21:50 UTC RelNotes 2.20: clarify sentence I had to read this sentence a few times to understand it. Let's try to clarify it. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 December 2018, 02:26:38 UTC
00ac55c Martin Ågren 03 December 2018, 20:21:49 UTC RelNotes 2.20: move some items between sections Some items that should be in "Performance, Internal Implementation, Development Support etc." have ended up in "UI, Workflows & Features" and "Fixes since v2.19". Move them, and do s/uses/use/ while at it. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 December 2018, 02:26:36 UTC
ac0edf1 Martin Ågren 03 December 2018, 21:21:31 UTC range-diff: always pass at least minimal diff options Commit d8981c3f88 ("format-patch: do not let its diff-options affect --range-diff", 2018-11-30) taught `show_range_diff()` to accept a NULL-pointer as an indication that it should use its own "reasonable default". That fixed a regression from a5170794 ("Merge branch 'ab/range-diff-no-patch'", 2018-11-18), but unfortunately it introduced a regression of its own. In particular, it means we forget the `file` member of the diff options, so rather than placing a range-diff in the cover-letter, we write it to stdout. In order to fix this, rewrite the two callers adjusted by d8981c3f88 to instead create a "dummy" set of diff options where they only fill in the fields we absolutely require, such as output file and color. Modify and extend the existing tests to try and verify that the right contents end up in the right place. Don't revert `show_range_diff()`, i.e., let it keep accepting NULL. Rather than removing what is dead code and figuring out it isn't actually dead and we've broken 2.20, just leave it for now. [es: retain diff coloring when going to stdout] Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 December 2018, 01:36:14 UTC
609713e Jiang Xin 03 December 2018, 04:49:45 UTC Merge branch 'master' of git://github.com/alshopov/git-po 03 December 2018, 04:49:45 UTC
9290395 Alexander Shopov 02 December 2018, 12:42:29 UTC l10n: bg.po: Updated Bulgarian translation (4187t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> 02 December 2018, 15:09:21 UTC
7345044 Peter Krefting 02 December 2018, 14:43:34 UTC l10n: sv.po: Update Swedish translation (4187t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> 02 December 2018, 14:43:34 UTC
a8f5329 Jiang Xin 02 December 2018, 14:36:36 UTC Merge branch 'fr_2.20_round3' of git://github.com/jnavila/git 02 December 2018, 14:36:36 UTC
5386321 Jean-Noël Avila 02 December 2018, 10:03:23 UTC l10n: fr.po v2.20.0 round 3 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> 02 December 2018, 10:03:23 UTC
cd1eab5 Jiang Xin 02 December 2018, 09:57:24 UTC Merge branch 'master' of https://github.com/vnwildman/git 02 December 2018, 09:57:24 UTC
8173e9c Tran Ngoc Quan 02 December 2018, 07:15:00 UTC l10n: vi(4187t): Updated Vietnamese translation for v2.20.0 rd3 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> 02 December 2018, 07:15:00 UTC
7c6767b Christopher Diaz Riveros 02 December 2018, 04:12:59 UTC l10n: es.po v2.20.0 round 3 Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org> 02 December 2018, 04:17:55 UTC
578d8ea Jiang Xin 02 December 2018, 02:56:26 UTC l10n: git.pot: v2.20.0 round 3 (5 new, 3 removed) Generate po/git.pot from v2.20.0-rc2 for git v2.20.0 l10n round 3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 02 December 2018, 02:56:26 UTC
924a01f Jiang Xin 02 December 2018, 02:55:14 UTC Merge branch 'master' of git://github.com/git-l10n/git-po 02 December 2018, 02:55:14 UTC
26a567e Jiang Xin 02 December 2018, 02:25:09 UTC Merge branch 'master' of https://github.com/vnwildman/git 02 December 2018, 02:25:09 UTC
84368b6 Tran Ngoc Quan 02 December 2018, 01:56:42 UTC l10n: vi(4185t): Updated Vietnamese translation for v2.20.0 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> 02 December 2018, 02:00:09 UTC
0960a4b Christopher Diaz Riveros 01 December 2018, 18:41:27 UTC l10n: es.po v2.20.0 round 1 Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org> 01 December 2018, 19:09:28 UTC
8a0ba68 Junio C Hamano 01 December 2018, 12:44:56 UTC Git 2.20-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 December 2018, 12:44:56 UTC
15cc2da Junio C Hamano 01 December 2018, 12:41:45 UTC Merge branch 'gh/diff-raw-has-no-ellipses' "git diff --raw" lost ellipses to adjust the output columns for some time now, but the documentation still showed them. * gh/diff-raw-has-no-ellipses: doc: update diff-format.txt for removed ellipses in --raw 01 December 2018, 12:41:45 UTC
c0e286a Junio C Hamano 01 December 2018, 12:41:45 UTC Merge branch 'ss/msvc-strcasecmp' MSVC update. * ss/msvc-strcasecmp: msvc: directly use MS version (_stricmp) of strcasecmp 01 December 2018, 12:41:45 UTC
6233704 Junio C Hamano 01 December 2018, 12:41:44 UTC Merge branch 'sg/test-BUG' test framework has been updated to make a bug in the test script (as opposed to bugs in Git that are discovered by running the tests) stand out more prominently. * sg/test-BUG: tests: send "bug in the test script" errors to the script's stderr 01 December 2018, 12:41:44 UTC
152cb0c Junio C Hamano 01 December 2018, 12:41:44 UTC Merge branch 'sg/test-cmp-rev' Test framework update. * sg/test-cmp-rev: test-lib-functions: make 'test_cmp_rev' more informative on failure 01 December 2018, 12:41:44 UTC
2c23f0b Junio C Hamano 01 December 2018, 12:41:44 UTC Merge branch 'ab/push-example-in-doc' An error message that sugggests how to give correct arguments to "git push" has been updated. * ab/push-example-in-doc: push: change needlessly ambiguous example in error 01 December 2018, 12:41:44 UTC
544d114 Junio C Hamano 01 December 2018, 12:41:44 UTC Merge branch 'rt/rebase-in-c-message-fix' * rt/rebase-in-c-message-fix: builtin/rebase.c: remove superfluous space in messages 01 December 2018, 12:41:44 UTC
97b6d63 Junio C Hamano 01 December 2018, 12:41:43 UTC Merge branch 'sg/daemon-test-signal-fix' Test fix. * sg/daemon-test-signal-fix: t/lib-git-daemon: fix signal checking 01 December 2018, 12:41:43 UTC
1efd0e8 Junio C Hamano 01 December 2018, 12:41:43 UTC Merge branch 'ma/reset-doc-rendering-fix' Doc updates. * ma/reset-doc-rendering-fix: git-reset.txt: render literal examples as monospace git-reset.txt: render tables correctly under Asciidoctor 01 December 2018, 12:41:43 UTC
671e629 Junio C Hamano 01 December 2018, 12:41:42 UTC Merge branch 'ab/replace-graft-with-replace-advice' The advice message to tell the user to migrate an existing graft file to the replace system when a graft file was read was shown even when "git replace --convert-graft-file" command, which is the way the message suggests to use, was running, which made little sense. * ab/replace-graft-with-replace-advice: advice: don't pointlessly suggest --convert-graft-file 01 December 2018, 12:41:42 UTC
881d72e Junio C Hamano 01 December 2018, 12:41:42 UTC Merge branch 'js/rebase-stat-unrelated-fix' "git rebase --stat" to transplant a piece of history onto a totally unrelated history were not working before and silently showed wrong result. With the recent reimplementation in C, it started to instead die with an error message, as the original logic was not prepared to cope with this case. This has now been fixed. * js/rebase-stat-unrelated-fix: rebase --stat: fix when rebasing to an unrelated history 01 December 2018, 12:41:42 UTC
945f6bd Junio C Hamano 01 December 2018, 12:41:42 UTC Merge branch 'js/rebase-reflog-action-fix' "git rebase" reimplemented recently in C accidentally changed the way reflog entries are recorded (earlier "rebase -i" identified the entries it leaves with "rebase -i", but the new version always marks them with "rebase"). This has been corrected. * js/rebase-reflog-action-fix: rebase: fix GIT_REFLOG_ACTION regression 01 December 2018, 12:41:42 UTC
d32fa3c Junio C Hamano 01 December 2018, 12:41:42 UTC Merge branch 'jc/format-patch-range-diff-fix' "git format-patch --range-diff" by mistake passed the diff options used to generate the primary output of the command to the range-diff machinery, which caused the range-diff in the cover letter to include fairly useless "--stat" output. This has been corrected by forcing a non-customizable default formatting options on the range-diff machinery when driven by format-patch. * jc/format-patch-range-diff-fix: format-patch: do not let its diff-options affect --range-diff 01 December 2018, 12:41:42 UTC
eff199a Ralf Thielow 30 November 2018, 18:11:45 UTC builtin/rebase.c: remove superfluous space in messages The whitespace breakages in these messages were introduced while reimplementing the subcommand in C. Match these messages to those in the original scripted version. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 December 2018, 11:53:05 UTC
d0a6644 Alexander Shopov 01 December 2018, 10:48:08 UTC l10n: bg.po: Updated Bulgarian translation (4185t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> 01 December 2018, 10:48:08 UTC
36dd693 Jiang Xin 01 December 2018, 08:15:51 UTC l10n: git.pot: v2.20.0 round 2 (2 new, 2 removed) Generate po/git.pot from v2.20.0-rc1-10-g7068cbc4ab for git v2.20.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 01 December 2018, 08:15:51 UTC
5d14a9d Jiang Xin 01 December 2018, 08:14:16 UTC Merge branch 'master' of git://github.com/git-l10n/git-po 01 December 2018, 08:14:16 UTC
5362f4d Jiang Xin 01 December 2018, 08:13:31 UTC Merge branch 'master' of git://github.com/alshopov/git-po 01 December 2018, 08:13:31 UTC
1a8e317 Jiang Xin 01 December 2018, 08:11:45 UTC Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 01 December 2018, 08:11:45 UTC
9cf1f0d Jiang Xin 01 December 2018, 07:36:53 UTC Merge branch 'fr_2.20_rnd1' of git://github.com/jnavila/git 01 December 2018, 07:36:53 UTC
3154af4 Alexander Shopov 29 October 2018, 12:31:37 UTC l10n: bg.po: Updated Bulgarian translation (4185t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> 30 November 2018, 22:17:50 UTC
8797f0f Johannes Schindelin 29 November 2018, 13:01:54 UTC rebase --stat: fix when rebasing to an unrelated history When rebasing to a commit history that has no common commits with the current branch, there is no merge base. In diffstat mode, this means that we cannot compare to the merge base, but we have to compare to the empty tree instead. Also, if running in verbose diffstat mode, we should not output Changes from <merge-base> to <onto> as that does not make sense without any merge base. Note: neither scripted nor built-in versoin of `git rebase` were prepared for this situation well. We use this opportunity not only to fix the bug(s), but also to make both versions' output consistent in this instance. And add a regression test to keep this working in all eternity. Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 November 2018, 05:43:00 UTC
13a5a9f Johannes Schindelin 29 November 2018, 19:09:21 UTC rebase: fix GIT_REFLOG_ACTION regression The scripted version of "rebase" honored the `GIT_REFLOG_ACTION`, and some automation scripts expected the reflog entries to be prefixed with "rebase -i", not "rebase", after running "rebase -i". This regressed in the reimplementation in C. Fix that, and add a regression test, both with `GIT_REFLOG_ACTION` set and unset. Note: the reflog message for "rebase finished" did *not* honor GIT_REFLOG_ACTION, and as we are very late in the v2.20.0-rcN phase, we leave that bug for later (as it seems that that bug has been with us from the very beginning). Reported by Ian Jackson. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 November 2018, 04:49:20 UTC
d8981c3 Junio C Hamano 30 November 2018, 04:27:11 UTC format-patch: do not let its diff-options affect --range-diff Stop leaking how the primary output of format-patch is customized to the range-diff machinery and instead let the latter use its own "reasonable default", in order to correct the breakage introduced by a5170794 ("Merge branch 'ab/range-diff-no-patch'", 2018-11-18) on the 'master' front. "git format-patch --range-diff..." without any weird diff option started to include the "range-diff --stat" output, which is rather useless right now, that made the whole thing unusable and this is probably the least disruptive way to whip the codebase into a shippable shape. We may want to later make the range-diff driven by format-patch more configurable, but that would have to wait until we have a good design. Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 November 2018, 04:47:55 UTC
4a81e9c Peter Krefting 29 November 2018, 11:55:22 UTC l10n: sv.po: Update Swedish translation (4185t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> 29 November 2018, 11:55:22 UTC
7068cbc Junio C Hamano 29 November 2018, 07:28:39 UTC Merge branch 'ja/i18n-fix' * ja/i18n-fix: i18n: fix small typos 29 November 2018, 07:28:39 UTC
9ec8af6 Junio C Hamano 29 November 2018, 07:28:39 UTC Merge branch 'nd/n18n-fix' * nd/n18n-fix: transport-helper.c: do not translate a string twice 29 November 2018, 07:28:39 UTC
d355e46 Jean-Noël Avila 28 November 2018, 21:43:09 UTC i18n: fix small typos Translating the new strings introduced for v2.20 showed some typos. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 November 2018, 06:45:31 UTC
3006f5e Martin Ågren 28 November 2018, 19:02:10 UTC git-reset.txt: render literal examples as monospace Large parts of this document do not use `backticks` around literal examples such as branch names (`topic/wip`), git usages, `HEAD` and `<commit-ish>` so they render as ordinary text. Fix that. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 November 2018, 06:44:18 UTC
4724f31 Martin Ågren 28 November 2018, 19:02:09 UTC git-reset.txt: render tables correctly under Asciidoctor Asciidoctor removes the indentation of each line in these tables, so the last lines of each table have a completely broken alignment. Similar to 379805051d ("Documentation: render revisions correctly under Asciidoctor", 2018-05-06), use an explicit literal block to indicate that we want to keep the leading whitespace in the tables. Because this gives us some extra indentation, we can remove the one that we have been carrying explicitly. That is, drop the first six spaces of indentation on each line. With Asciidoc (8.6.10), this results in identical rendering before and after this commit, both for git-reset.1 and git-reset.html. Reported-by: Paweł Samoraj <samoraj.pawel@gmail.com> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 November 2018, 06:44:15 UTC
739fb71 Nguyễn Thái Ngọc Duy 26 November 2018, 19:57:56 UTC transport-helper.c: do not translate a string twice Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 November 2018, 06:30:03 UTC
8821e90 Ævar Arnfjörð Bjarmason 27 November 2018, 20:12:55 UTC advice: don't pointlessly suggest --convert-graft-file The advice to run 'git replace --convert-graft-file' added in f9f99b3f7d ("Deprecate support for .git/info/grafts", 2018-04-29) didn't add an exception for the 'git replace --convert-graft-file' codepath itself. As a result we'd suggest running --convert-graft-file while the user was running --convert-graft-file, which makes no sense. Before: $ git replace --convert-graft-file hint: Support for <GIT_DIR>/info/grafts is deprecated hint: and will be removed in a future Git version. hint: hint: Please use "git replace --convert-graft-file" hint: to convert the grafts into replace refs. hint: hint: Turn this message off by running hint: "git config advice.graftFileDeprecated false" Add a check for that case and skip printing the advice while the user is busy following our advice. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 November 2018, 06:15:17 UTC
6b822f7 Jean-Noël Avila 28 November 2018, 21:16:56 UTC l10n: fr.po v2.20 rnd 1 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> 28 November 2018, 21:16:56 UTC
4c2eb06 SZEDER Gábor 26 November 2018, 20:03:37 UTC t/lib-git-daemon: fix signal checking Test scripts checking 'git daemon' stop the daemon with a TERM signal, and the 'stop_git_daemon' helper checks the daemon's exit status to make sure that it indeed died because of that signal. This check is bogus since 03c39b3458 (t/lib-git-daemon: use test_match_signal, 2016-06-24), for two reasons: - Right after killing 'git daemon', 'stop_git_daemon' saves its exit status in a variable, but since 03c39b3458 the condition checking the exit status looks at '$?', which at this point is not the exit status of 'git daemon', but that of the variable assignment, i.e. it's always 0. - The unexpected exit status should abort the whole test script with 'error', but it doesn't, because 03c39b3458 forgot to negate 'test_match_signal's exit status in the condition. This patch fixes both issues. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 November 2018, 00:53:58 UTC
a159801 Junio C Hamano 26 November 2018, 14:13:42 UTC Merge branch 'nd/per-worktree-ref-iteration' Build fix. * nd/per-worktree-ref-iteration: files-backend.c: fix build error on Solaris 26 November 2018, 14:13:43 UTC
590e5b8 Junio C Hamano 26 November 2018, 14:13:42 UTC Merge branch 'tb/clone-case-smashing-warning-test' The code recently added to "git clone" to see if the platform's filesystem is adequate to check out and use the project code correctly (e.g. a case smashing filesystem cannot be used for a project with two files whose paths are different only in case) was meant to help Windows users, but the test for it was not enabled for that platform, which has been corrected. * tb/clone-case-smashing-warning-test: t5601-99: Enable colliding file detection for MINGW 26 November 2018, 14:13:42 UTC
ab15ccd Junio C Hamano 26 November 2018, 14:13:41 UTC Merge branch 'jk/t5562-perl-path-fix' Hotfix for test breakage on platforms whose Perl is not at /usr/bin/perl * jk/t5562-perl-path-fix: t5562: fix perl path 26 November 2018, 14:13:42 UTC
f9ea6e4 Greg Hurrell 24 November 2018, 09:29:58 UTC doc: update diff-format.txt for removed ellipses in --raw Since 7cb6ac1e4b ("diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value", 2017-12-03), the "--raw" format of diff does not add ellipses in an attempt to align the output, but the documentation was not updated to reflect this. Signed-off-by: Greg Hurrell <greg@hurrell.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 November 2018, 06:59:14 UTC
46c0eb5 Nguyễn Thái Ngọc Duy 25 November 2018, 04:58:16 UTC files-backend.c: fix build error on Solaris This function files_reflog_path returns void, which usually means "return;" not returning "void value" from another function. Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 November 2018, 06:22:58 UTC
d9324e4 Jordi Mas 25 November 2018, 13:53:41 UTC l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> 25 November 2018, 13:53:41 UTC
8c8fad9 Jeff King 22 November 2018, 23:38:21 UTC t5562: fix perl path Some systems do not have perl installed to /usr/bin. Use the variable from the build settiings, and call perl directly than via shebang. Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 November 2018, 01:44:30 UTC
a7f609e Torsten Bögershausen 22 November 2018, 17:59:52 UTC t5601-99: Enable colliding file detection for MINGW Commit b878579ae7 (clone: report duplicate entries on case-insensitive filesystems - 2018-08-17) adds a warning to user when cloning a repo with case-sensitive file names on a case-insensitive file system. This test has never been enabled for MINGW. It had been working since day 1, but I forget to report that to the author. Enable it after a re-test. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 November 2018, 01:41:24 UTC
7f4e641 Junio C Hamano 21 November 2018, 14:24:52 UTC Git 2.20-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 November 2018, 14:24:52 UTC
7cb1ea1 Junio C Hamano 21 November 2018, 14:23:48 UTC Sync with 2.19.2 21 November 2018, 14:23:48 UTC
98cdfbb Junio C Hamano 21 November 2018, 14:22:12 UTC Git 2.19.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 November 2018, 14:22:12 UTC
a4830a7 Junio C Hamano 21 November 2018, 13:58:10 UTC Merge branch 'sg/test-rebase-editor-fix' into maint * sg/test-rebase-editor-fix: t3404-rebase-interactive: test abbreviated commands 21 November 2018, 13:58:10 UTC
85eb0f1 Junio C Hamano 21 November 2018, 13:58:09 UTC Merge branch 'tb/char-may-be-unsigned' into maint Build portability fix. * tb/char-may-be-unsigned: path.c: char is not (always) signed 21 November 2018, 13:58:09 UTC
2b15340 Junio C Hamano 21 November 2018, 13:58:08 UTC Merge branch 'jk/uploadpack-packobjectshook-fix' into maint Code clean-up that results in a small bugfix. * jk/uploadpack-packobjectshook-fix: upload-pack: fix broken if/else chain in config callback 21 November 2018, 13:58:09 UTC
227124b Junio C Hamano 21 November 2018, 13:58:08 UTC Merge branch 'uk/merge-subtree-doc-update' into maint Belated documentation update to adjust to a new world order that happened a yew years ago. * uk/merge-subtree-doc-update: howto/using-merge-subtree: mention --allow-unrelated-histories 21 November 2018, 13:58:08 UTC
196afc4 Junio C Hamano 21 November 2018, 13:58:08 UTC Merge branch 'jc/cocci-preincr' into maint Code cleanup. * jc/cocci-preincr: fsck: s/++i > 1/i++/ cocci: simplify "if (++u > 1)" to "if (u++)" 21 November 2018, 13:58:08 UTC
eba1416 Junio C Hamano 21 November 2018, 13:58:07 UTC Merge branch 'ah/doc-updates' into maint Doc updates. * ah/doc-updates: doc: fix formatting in git-update-ref doc: fix indentation of listing blocks in gitweb.conf.txt doc: fix descripion for 'git tag --format' doc: fix inappropriate monospace formatting doc: fix ASCII art tab spacing doc: clarify boundaries of 'git worktree list --porcelain' 21 November 2018, 13:58:07 UTC
b53df43 Junio C Hamano 21 November 2018, 13:58:07 UTC Merge branch 'sg/doc-show-branch-typofix' into maint Docfix. * sg/doc-show-branch-typofix: doc: fix small typo in git show-branch 21 November 2018, 13:58:07 UTC
69ae666 Junio C Hamano 21 November 2018, 13:58:06 UTC Merge branch 'tq/branch-style-fix' into maint Code clean-up. * tq/branch-style-fix: branch: trivial style fix 21 November 2018, 13:58:06 UTC
2b40fdd Junio C Hamano 21 November 2018, 13:58:06 UTC Merge branch 'tq/branch-create-wo-branch-get' into maint Code clean-up. * tq/branch-create-wo-branch-get: builtin/branch.c: remove useless branch_get 21 November 2018, 13:58:06 UTC
c2d6378 Junio C Hamano 21 November 2018, 13:58:06 UTC Merge branch 'sb/strbuf-h-update' into maint Code clean-up to serve as a BCP example. Further clean-up patches may want to follow soon. * sb/strbuf-h-update: strbuf.h: format according to coding guidelines 21 November 2018, 13:58:06 UTC
a6dc172 Junio C Hamano 21 November 2018, 13:58:05 UTC Merge branch 'du/cherry-is-plumbing' into maint Doc update to mark "git cherry" as a plumbing command. * du/cherry-is-plumbing: doc: move git-cherry to plumbing 21 November 2018, 13:58:05 UTC
c3ba2ae Junio C Hamano 21 November 2018, 13:58:05 UTC Merge branch 'du/get-tar-commit-id-is-plumbing' into maint Doc update to mark "git get-tar-commit-id" as a plumbing command. * du/get-tar-commit-id-is-plumbing: doc: move git-get-tar-commit-id to plumbing 21 November 2018, 13:58:05 UTC
53016f4 Junio C Hamano 21 November 2018, 13:58:04 UTC Merge branch 'mm/doc-no-dashed-git' into maint Doc update. * mm/doc-no-dashed-git: doc: fix a typo and clarify a sentence 21 November 2018, 13:58:05 UTC
95500c8 Junio C Hamano 21 November 2018, 13:58:04 UTC Merge branch 'du/rev-parse-is-plumbing' into maint Doc update. * du/rev-parse-is-plumbing: doc: move git-rev-parse from porcelain to plumbing 21 November 2018, 13:58:04 UTC
6262f5c Junio C Hamano 21 November 2018, 13:58:04 UTC Merge branch 'ma/t7005-bash-workaround' into maint Test fix. * ma/t7005-bash-workaround: t7005-editor: quote filename to fix whitespace-issue 21 November 2018, 13:58:04 UTC
6b57374 Junio C Hamano 21 November 2018, 13:58:03 UTC Merge branch 'jc/how-to-document-api' into maint Doc update. * jc/how-to-document-api: CodingGuidelines: document the API in *.h files 21 November 2018, 13:58:03 UTC
368ba6b Junio C Hamano 21 November 2018, 13:58:03 UTC Merge branch 'mw/doc-typofixes' into maint Typofixes. * mw/doc-typofixes: docs: typo: s/isimilar/similar/ docs: graph: remove unnecessary `graph_update()' call docs: typo: s/go/to/ 21 November 2018, 13:58:03 UTC
587b3f5 Junio C Hamano 21 November 2018, 13:58:02 UTC Merge branch 'rs/sequencer-oidset-insert-avoids-dups' into maint Code clean-up. * rs/sequencer-oidset-insert-avoids-dups: sequencer: use return value of oidset_insert() 21 November 2018, 13:58:02 UTC
1713093 Junio C Hamano 21 November 2018, 13:58:02 UTC Merge branch 'ma/mailing-list-address-in-git-help' into maint Doc update. * ma/mailing-list-address-in-git-help: git doc: direct bug reporters to mailing list archive 21 November 2018, 13:58:02 UTC
060d061 Junio C Hamano 21 November 2018, 13:58:01 UTC Merge branch 'nd/packobjectshook-doc-fix' into maint Doc update. * nd/packobjectshook-doc-fix: config.txt: correct the note about uploadpack.packObjectsHook 21 November 2018, 13:58:01 UTC
6f1c815 Junio C Hamano 21 November 2018, 13:58:01 UTC Merge branch 'ma/t1400-undebug-test' into maint Test fix. * ma/t1400-undebug-test: t1400: drop debug `echo` to actually execute `test` 21 November 2018, 13:58:01 UTC
35e54ea Junio C Hamano 21 November 2018, 13:58:00 UTC Merge branch 'ma/commit-graph-docs' into maint Doc update. * ma/commit-graph-docs: Doc: refer to the "commit-graph file" with dash git-commit-graph.txt: refer to "*commit*-graph file" git-commit-graph.txt: typeset more in monospace git-commit-graph.txt: fix bullet lists 21 November 2018, 13:58:00 UTC
871955c Junio C Hamano 21 November 2018, 13:58:00 UTC Merge branch 'dz/credential-doc-url-matching-rules' into maint Doc update. * dz/credential-doc-url-matching-rules: doc: clarify gitcredentials path component matching 21 November 2018, 13:58:00 UTC
75266b4 Junio C Hamano 21 November 2018, 13:57:59 UTC Merge branch 'jk/check-everything-connected-is-long-gone' into maint Comment fix. * jk/check-everything-connected-is-long-gone: receive-pack: update comment with check_everything_connected 21 November 2018, 13:58:00 UTC
0caea62 Junio C Hamano 21 November 2018, 13:57:58 UTC Merge branch 'fe/doc-updates' into maint Doc updates. * fe/doc-updates: git-describe.1: clarify that "human readable" is also git-readable git-column.1: clarify initial description, provide examples git-archimport.1: specify what kind of Arch we're talking about 21 November 2018, 13:57:58 UTC
2a98f6c Junio C Hamano 21 November 2018, 13:57:58 UTC Merge branch 'tg/t5551-with-curl-7.61.1' into maint Test update. Supersedes tz/t5551-with-curl-7.61.1 topic * tg/t5551-with-curl-7.61.1: t5551: compare sorted cookies files t5551: move setup code inside test_expect blocks 21 November 2018, 13:57:58 UTC
a753373 Junio C Hamano 21 November 2018, 13:57:58 UTC Merge branch 'tq/refs-internal-comment-fix' into maint Fix for typo in a sample code in comment. * tq/refs-internal-comment-fix: refs: docstring typo 21 November 2018, 13:57:58 UTC
85f6afc Junio C Hamano 21 November 2018, 13:57:57 UTC Merge branch 'sg/split-index-test' into maint Test updates. * sg/split-index-test: t0090: disable GIT_TEST_SPLIT_INDEX for the test checking split index t1700-split-index: drop unnecessary 'grep' 21 November 2018, 13:57:57 UTC
3ae0ac6 Junio C Hamano 21 November 2018, 13:57:57 UTC Merge branch 'bw/protocol-v2' into maint Doc fix. * bw/protocol-v2: config: document value 2 for protocol.version 21 November 2018, 13:57:57 UTC
d5e4cba Junio C Hamano 21 November 2018, 13:57:56 UTC Merge branch 'sb/string-list-remove-unused' into maint Code clean-up. * sb/string-list-remove-unused: string-list: remove unused function print_string_list 21 November 2018, 13:57:56 UTC
back to top