Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sd/stash-wo-user-name' | Junio C Hamano | 2019-01-04 | 1 | -0/+28 |
|\ | |||||
| * | stash: tolerate missing user identity | Slavica Djukic | 2018-11-19 | 1 | -0/+28 |
* | | Merge branch 'sg/clone-initial-fetch-configuration' | Junio C Hamano | 2019-01-04 | 1 | -0/+47 |
|\ \ | |||||
| * | | clone: respect additional configured fetch refspecs during initial fetch | SZEDER Gábor | 2018-11-16 | 1 | -0/+47 |
* | | | Merge branch 'nd/checkout-dwim-fix' | Junio C Hamano | 2019-01-04 | 2 | -1/+33 |
|\ \ \ | |||||
| * | | | checkout: disambiguate dwim tracking branches and local files | Nguyễn Thái Ngọc Duy | 2018-11-14 | 2 | -1/+33 |
| | |/ | |/| | |||||
* | | | Merge branch 'ab/push-dwim-dst' | Junio C Hamano | 2019-01-04 | 1 | -0/+55 |
|\ \ \ | |||||
| * | | | push: test that <src> doesn't DWYM if <dst> is unqualified | Ævar Arnfjörð Bjarmason | 2018-11-14 | 1 | -0/+27 |
| * | | | push: add an advice on unqualified <dst> push | Ævar Arnfjörð Bjarmason | 2018-11-14 | 1 | -0/+28 |
| |/ / | |||||
* | | | Merge branch 'en/fast-export-import' | Junio C Hamano | 2019-01-04 | 1 | -3/+77 |
|\ \ \ | |||||
| * | | | fast-export: add a --show-original-ids option to show original names | Elijah Newren | 2018-11-17 | 1 | -0/+17 |
| * | | | fast-export: add --reference-excluded-parents option | Elijah Newren | 2018-11-17 | 1 | -0/+11 |
| * | | | fast-export: ensure we export requested refs | Elijah Newren | 2018-11-17 | 1 | -3/+13 |
| * | | | fast-export: when using paths, avoid corrupt stream with non-existent mark | Elijah Newren | 2018-11-17 | 1 | -0/+20 |
| * | | | fast-export: avoid dying when filtering by paths and old tags exist | Elijah Newren | 2018-11-17 | 1 | -0/+16 |
| |/ / | |||||
* | | | Merge branch 'en/merge-path-collision' | Junio C Hamano | 2019-01-04 | 3 | -78/+829 |
|\ \ \ | |||||
| * | | | t6036: avoid non-portable "cp -a" | Carlo Marcelo Arenas Belón | 2018-12-01 | 1 | -1/+1 |
| * | | | t6036, t6043: increase code coverage for file collision handling | Elijah Newren | 2018-11-08 | 2 | -0/+88 |
| * | | | merge-recursive: improve rename/rename(1to2)/add[/add] handling | Elijah Newren | 2018-11-08 | 2 | -17/+36 |
| * | | | merge-recursive: improve handling for rename/rename(2to1) conflicts | Elijah Newren | 2018-11-08 | 3 | -58/+75 |
| * | | | merge-recursive: fix rename/add conflict handling | Elijah Newren | 2018-11-08 | 2 | -13/+15 |
| * | | | merge-recursive: increase marker length with depth of recursion | Elijah Newren | 2018-11-08 | 1 | -0/+151 |
| * | | | t6036, t6042: testcases for rename collision of already conflicting files | Elijah Newren | 2018-11-08 | 2 | -0/+312 |
| * | | | t6042: add tests for consistency in file collision conflict handling | Elijah Newren | 2018-11-08 | 1 | -0/+162 |
* | | | | Merge branch 'nd/i18n' | Junio C Hamano | 2019-01-04 | 8 | -44/+44 |
|\ \ \ \ | |||||
| * | | | | fsck: mark strings for translation | Nguyễn Thái Ngọc Duy | 2018-11-12 | 4 | -33/+33 |
| * | | | | parse-options.c: mark more strings for translation | Nguyễn Thái Ngọc Duy | 2018-11-12 | 1 | -2/+2 |
| * | | | | parse-options: replace opterror() with optname() | Nguyễn Thái Ngọc Duy | 2018-11-12 | 1 | -1/+1 |
| * | | | | read-cache.c: mark more strings for translation | Nguyễn Thái Ngọc Duy | 2018-11-12 | 1 | -1/+1 |
* | | | | | Merge branch 'jc/run-command-report-exec-failure-fix' into maint | Junio C Hamano | 2018-12-15 | 1 | -3/+6 |
|\ \ \ \ \ | |||||
| * | | | | | run-command: report exec failure | Junio C Hamano | 2018-12-12 | 1 | -3/+6 |
* | | | | | | Merge branch 'js/t9902-send-email-completion-fix' into maint | Junio C Hamano | 2018-12-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t9902: 'send-email' test case requires PERL | Johannes Schindelin | 2018-12-14 | 1 | -1/+1 |
* | | | | | | | Merge branch 'js/mailinfo-format-flowed-fix' into maint | Junio C Hamano | 2018-12-15 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | t4256: mark support files as LF-only | Johannes Schindelin | 2018-12-13 | 1 | -0/+1 |
* | | | | | | | Merge branch 'es/format-patch-range-diff-fix-fix' | Junio C Hamano | 2018-12-04 | 1 | -7/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | range-diff: always pass at least minimal diff options | Martin Ågren | 2018-12-04 | 1 | -7/+13 |
* | | | | | | | | Merge branch 'sg/test-BUG' | Junio C Hamano | 2018-12-01 | 7 | -23/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | tests: send "bug in the test script" errors to the script's stderr | SZEDER Gábor | 2018-11-20 | 7 | -23/+26 |
* | | | | | | | | | Merge branch 'sg/test-cmp-rev' | Junio C Hamano | 2018-12-01 | 1 | -3/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | test-lib-functions: make 'test_cmp_rev' more informative on failure | SZEDER Gábor | 2018-11-20 | 1 | -3/+17 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'sg/daemon-test-signal-fix' | Junio C Hamano | 2018-12-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t/lib-git-daemon: fix signal checking | SZEDER Gábor | 2018-11-27 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'ab/replace-graft-with-replace-advice' | Junio C Hamano | 2018-12-01 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | advice: don't pointlessly suggest --convert-graft-file | Ævar Arnfjörð Bjarmason | 2018-11-29 | 1 | -1/+4 |
| * | | | | | | | | | | Merge branch 'sg/test-rebase-editor-fix' into maint | Junio C Hamano | 2018-11-21 | 2 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ma/t7005-bash-workaround' into maint | Junio C Hamano | 2018-11-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ma/t1400-undebug-test' into maint | Junio C Hamano | 2018-11-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tg/t5551-with-curl-7.61.1' into maint | Junio C Hamano | 2018-11-21 | 1 | -34/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/split-index-test' into maint | Junio C Hamano | 2018-11-21 | 2 | -8/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |