summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | l10n: git.pot: v2.14.0 round 1 (34 new, 23 removed)Jiang Xin2017-07-151-2993/+3059
| * | | | | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-poJiang Xin2017-07-152-2378/+3840
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2017-06-111-2369/+3831
| | * | | | | | | | | | | Merge branch 'master' of https://github.com/Softcatala/git-po into maintJiang Xin2017-05-311-9/+9
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | l10n: Fixes to Catalan translationJordi Mas2017-05-101-9/+9
* | | | | | | | | | | | | | Sync with maintJunio C Hamano2017-07-211-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | fixes from 'master' for 2.13.4Junio C Hamano2017-07-212-1/+11
| * | | | | | | | | | | | | Merge branch 'ew/fd-cloexec-fix' into maintJunio C Hamano2017-07-211-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/fix-rebase-doc-picture' into maintJunio C Hamano2017-07-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/alias-case-sensitivity' into maintJunio C Hamano2017-07-212-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bb/unicode-10.0' into maintJunio C Hamano2017-07-211-13/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | Hopefully the final last-minute fix before -rc1Junio C Hamano2017-07-211-1/+11
* | | | | | | | | | | | | | | | | | Merge branch 'ks/doc-fixes'Junio C Hamano2017-07-212-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | doc: reformat the paragraph containing the 'cut-line'ks/doc-fixesKaartic Sivaraam2017-07-181-5/+6
| * | | | | | | | | | | | | | | | | doc: camelCase the i18n config variables to improve readabilityKaartic Sivaraam2017-07-171-5/+5
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'rj/cygwin-fread-reads-directories'Junio C Hamano2017-07-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | config.mak.uname: set FREAD_READS_DIRECTORIES for cygwinrj/cygwin-fread-reads-directoriesRamsay Jones2017-07-211-0/+1
* | | | | | | | | | | | | | | | | | Merge branch 'jc/po-pritime-fix'Junio C Hamano2017-07-211-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Makefile: help gettext tools to cope with our custom PRItime formatjc/po-pritime-fixJunio C Hamano2017-07-201-0/+21
* | | | | | | | | | | | | | | | | | A few more topics while waiting for the po/PRItime resolutionJunio C Hamano2017-07-201-0/+12
* | | | | | | | | | | | | | | | | | Merge branch 'mt/p4-parse-G-output'Junio C Hamano2017-07-202-31/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | git-p4: filter for {'code':'info'} in p4CmdListmt/p4-parse-G-outputMiguel Torroja2017-07-132-5/+8
| * | | | | | | | | | | | | | | | | | git-p4: parse marshal output "p4 -G" in p4 changesMiguel Torroja2017-07-132-29/+58
| * | | | | | | | | | | | | | | | | | git-p4: git-p4 tests with p4 triggersMiguel Torroja2017-07-131-0/+103
* | | | | | | | | | | | | | | | | | | Merge branch 'ew/fd-cloexec-fix'Junio C Hamano2017-07-201-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | set FD_CLOEXEC properly when O_CLOEXEC is not supportedew/fd-cloexec-fixEric Wong2017-07-171-3/+3
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/build-with-asan'Junio C Hamano2017-07-201-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Makefile: allow combining UBSan with other sanitizersjk/build-with-asanRené Scharfe2017-07-171-1/+6
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-copy-bytes-fix'Junio C Hamano2017-07-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | t: handle EOF in test_copy_bytes()jk/test-copy-bytes-fixJeff King2017-07-171-0/+1
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'js/alias-case-sensitivity'Junio C Hamano2017-07-202-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | alias: compare alias name *case-insensitively*js/alias-case-sensitivityJohannes Schindelin2017-07-172-2/+2
| * | | | | | | | | | | | | | | | | | t1300: demonstrate that CamelCased aliases regressedJohannes Schindelin2017-07-171-0/+7
* | | | | | | | | | | | | | | | | | | RelNotes: mention "sha1dc: optionally use sha1collisiondetection as a submodule"Ævar Arnfjörð Bjarmason2017-07-201-0/+5
* | | | | | | | | | | | | | | | | | | RelNotes: mention "log: make --regexp-ignore-case work with --perl-regexp"Ævar Arnfjörð Bjarmason2017-07-201-0/+3
* | | | | | | | | | | | | | | | | | | RelNotes: mention "log: add -P as a synonym for --perl-regexp"Ævar Arnfjörð Bjarmason2017-07-201-0/+2
| |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | A few more topics before 2.14-rc1Junio C Hamano2017-07-181-19/+45
* | | | | | | | | | | | | | | | | | Merge branch 'jk/gc-pre-detach-under-hook'Junio C Hamano2017-07-182-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | gc: run pre-detach operations under lockjk/gc-pre-detach-under-hookJeff King2017-07-122-0/+25
* | | | | | | | | | | | | | | | | | Merge branch 'jn/hooks-pre-rebase-sample-fix'Junio C Hamano2017-07-181-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | pre-rebase hook: capture documentation in a <<here documentjn/hooks-pre-rebase-sample-fixJonathan Nieder2017-07-111-3/+3
* | | | | | | | | | | | | | | | | | Merge branch 'rs/progress-overall-throughput-at-the-end'Junio C Hamano2017-07-181-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | progress: show overall rate in last updaters/progress-overall-throughput-at-the-endRené Scharfe2017-07-091-2/+6
* | | | | | | | | | | | | | | | | | Merge branch 'tb/push-to-cygwin-unc-path'Junio C Hamano2017-07-185-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | cygwin: allow pushing to UNC pathstb/push-to-cygwin-unc-pathTorsten Bögershausen2017-07-055-0/+27
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Git 2.14-rc0v2.14.0-rc0smapJunio C Hamano2017-07-132-5/+13
* | | | | | | | | | | | | | | | Merge branch 'jk/build-with-asan'Junio C Hamano2017-07-132-3/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Makefile: disable unaligned loads with UBSanJeff King2017-07-101-0/+3
| * | | | | | | | | | | | | | | Makefile: turn off -fomit-frame-pointer with sanitizersJeff King2017-07-101-0/+1
| * | | | | | | | | | | | | | | Makefile: add helper for compiling with -fsanitizeJeff King2017-07-101-0/+4