summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* config.mak.uname: set FREAD_READS_DIRECTORIES for cygwinrj/cygwin-fread-reads-directoriesRamsay Jones2017-07-211-0/+1
* 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
| * | | | | | | | test-lib: turn on ASan abort_on_error by defaultJeff King2017-07-101-1/+1
| * | | | | | | | test-lib: set ASAN_OPTIONS variable before we run gitJeff King2017-07-101-3/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-138-41/+193
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/fetch cleanup: always set default value for submodule recursingStefan Beller2017-06-271-3/+2
| * | | | | | | | pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-235-16/+157
| * | | | | | | | builtin/fetch: parse recurse-submodules-default at default options parsingStefan Beller2017-06-231-9/+10
| * | | | | | | | builtin/fetch: factor submodule recurse parsing out to submodule configStefan Beller2017-06-233-16/+27
* | | | | | | | | Merge branch 'sb/hashmap-customize-comparison'Junio C Hamano2017-07-1320-409/+431
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | hashmap: migrate documentation from Documentation/technical into headersb/hashmap-customize-comparisonStefan Beller2017-06-302-341/+316
| * | | | | | | | | patch-ids.c: use hashmap correctlyStefan Beller2017-06-301-4/+4
| * | | | | | | | | hashmap.h: compare function has access to a data fieldStefan Beller2017-06-3019-66/+113
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/grep-lose-opt-regflags'Junio C Hamano2017-07-134-32/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grep: remove redundant REG_NEWLINE when compiling fixed regexab/grep-lose-opt-regflagsÆvar Arnfjörð Bjarmason2017-06-301-1/+1
| * | | | | | | | | grep: remove regflags from the public grep_opt APIÆvar Arnfjörð Bjarmason2017-06-304-14/+34
| * | | | | | | | | grep: remove redundant and verbose re-assignments to 0Ævar Arnfjörð Bjarmason2017-06-301-11/+0
| * | | | | | | | | grep: remove redundant "fixed" field re-assignment to 0Ævar Arnfjörð Bjarmason2017-06-301-2/+0
| * | | | | | | | | grep: adjust a redundant grep pattern type assignmentÆvar Arnfjörð Bjarmason2017-06-301-4/+1
| * | | | | | | | | grep: remove redundant double assignment to 0Ævar Arnfjörð Bjarmason2017-06-301-1/+0
| |/ / / / / / / /