Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | difftool: create a tmpdir path without repeated slashes | David Aguilar | 2021-10-01 | 1 | -0/+7 |
* | Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftool | Junio C Hamano | 2021-09-23 | 1 | -2/+65 |
|\ | |||||
| * | difftool: fix symlink-file writing in dir-diff mode | David Aguilar | 2021-09-23 | 1 | -2/+65 |
* | | Merge branch 'ab/retire-option-argument' into da/difftool | Junio C Hamano | 2021-09-20 | 2 | -6/+0 |
|\ \ | |||||
| * | | parse-options API: remove OPTION_ARGUMENT feature | Ævar Arnfjörð Bjarmason | 2021-09-13 | 2 | -6/+0 |
* | | | Merge branch 'pb/test-use-user-env' | Junio C Hamano | 2021-09-15 | 3 | -21/+103 |
|\ \ \ | |||||
| * | | | test-lib-functions: keep user's debugger config files and TERM in 'debug' | Philippe Blain | 2021-09-07 | 2 | -16/+50 |
| * | | | test-lib-functions: optionally keep HOME, TERM and SHELL in 'test_pause' | Philippe Blain | 2021-09-07 | 3 | -5/+53 |
| * | | | test-lib-functions: use 'TEST_SHELL_PATH' in 'test_pause' | Philippe Blain | 2021-09-07 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'jc/trivial-threeway-binary-merge' | Junio C Hamano | 2021-09-15 | 1 | -0/+45 |
|\ \ \ | |||||
| * | | | apply: resolve trivial merge without hitting ll-merge with "--3way" | Junio C Hamano | 2021-09-06 | 1 | -0/+45 |
* | | | | Merge branch 'ab/send-email-config-fix' | Junio C Hamano | 2021-09-15 | 1 | -0/+15 |
|\ \ \ \ | |||||
| * | | | | send-email: fix a "first config key wins" regression in v2.33.0 | Ævar Arnfjörð Bjarmason | 2021-09-07 | 1 | -0/+15 |
* | | | | | Merge branch 'jk/log-warn-on-bogus-encoding' | Junio C Hamano | 2021-09-10 | 1 | -0/+7 |
|\ \ \ \ \ | |||||
| * | | | | | logmsg_reencode(): warn when iconv() fails | Jeff King | 2021-08-27 | 1 | -0/+7 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'mk/clone-recurse-submodules' | Junio C Hamano | 2021-09-10 | 1 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabled | Mahi Kolla | 2021-08-30 | 1 | -0/+12 |
| |/ / / / | |||||
* | | | | | Merge branch 'uk/userdiff-php-enum' | Junio C Hamano | 2021-09-10 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | userdiff: support enum keyword in PHP hunk header | USAMI Kenta | 2021-08-31 | 1 | -0/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'tk/fast-export-anonymized-tag-fix' | Junio C Hamano | 2021-09-10 | 1 | -4/+6 |
|\ \ \ \ \ | |||||
| * | | | | | fast-export: fix anonymized tag using original length | Tal Kelrich | 2021-08-31 | 1 | -4/+6 |
* | | | | | | Merge branch 'ab/commit-graph-usage' | Junio C Hamano | 2021-09-10 | 1 | -0/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit-graph: show "unexpected subcommand" error | Ævar Arnfjörð Bjarmason | 2021-08-31 | 1 | -1/+15 |
| * | | | | | | commit-graph: show usage on "commit-graph [write|verify] garbage" | Ævar Arnfjörð Bjarmason | 2021-08-31 | 1 | -0/+5 |
* | | | | | | | Merge branch 'mh/send-email-reset-in-reply-to' | Junio C Hamano | 2021-09-10 | 1 | -0/+45 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | send-email: avoid incorrect header propagation | Marvin Häuser | 2021-08-30 | 1 | -0/+45 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sg/set-ceiling-during-tests' | Junio C Hamano | 2021-09-10 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | test-lib: set GIT_CEILING_DIRECTORIES to protect the surrounding repository | SZEDER Gábor | 2021-08-30 | 1 | -1/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ka/want-ref-in-namespace' | Junio C Hamano | 2021-09-10 | 1 | -36/+172 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | upload-pack.c: treat want-ref relative to namespace | Kim Altintop | 2021-09-01 | 1 | -0/+135 |
| * | | | | | | | t5730: introduce fetch command helper | Kim Altintop | 2021-09-01 | 1 | -36/+37 |
* | | | | | | | | Merge branch 'zh/cherry-pick-advice' | Junio C Hamano | 2021-09-10 | 2 | -7/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | cherry-pick: use better advice message | ZheNing Hu | 2021-08-23 | 2 | -7/+26 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'sg/column-nl' | Junio C Hamano | 2021-09-08 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | column: fix parsing of the '--nl' option | SZEDER Gábor | 2021-08-26 | 1 | -0/+18 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rs/branch-allow-deleting-dangling' | Junio C Hamano | 2021-09-08 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | branch: allow deleting dangling branches with --force | René Scharfe | 2021-08-28 | 1 | -0/+13 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'mt/quiet-with-delayed-checkout' | Junio C Hamano | 2021-09-08 | 1 | -0/+71 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout: make delayed checkout respect --quiet and --no-progress | Matheus Tavares | 2021-08-27 | 1 | -0/+71 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'dd/diff-files-unmerged-fix' | Junio C Hamano | 2021-09-08 | 1 | -0/+53 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff-lib: ignore paths that are outside $cwd if --relative asked | Đoàn Trần Công Danh | 2021-08-25 | 1 | -0/+53 |
* | | | | | | | | | Merge branch 'dd/t6300-wo-gpg-fix' | Junio C Hamano | 2021-09-08 | 1 | -11/+18 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t6300: check for cat-file exit status code | Đoàn Trần Công Danh | 2021-08-25 | 1 | -1/+3 |
| * | | | | | | | | | t6300: don't run cat-file on non-existent object | Đoàn Trần Công Danh | 2021-08-25 | 1 | -11/+16 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/t5323-no-pack-test-fix' | Junio C Hamano | 2021-09-08 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5323: drop mentions of "master" | Jeff King | 2021-08-25 | 1 | -2/+2 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'js/maintenance-launchctl-fix' | Junio C Hamano | 2021-09-08 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | maintenance: skip bootout/bootstrap when plist is registered | Derrick Stolee | 2021-08-24 | 1 | -0/+17 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ab/ls-remote-packet-trace' | Junio C Hamano | 2021-09-08 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | ls-remote: set packet_trace_identity(<name>) | Ævar Arnfjörð Bjarmason | 2021-08-24 | 1 | -3/+3 |
| | |/ / / / / / / | |/| | | | | | | |