summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | 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
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Sync with v2.13.3Junio C Hamano2017-07-121-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Git 2.13.3v2.13.3Junio C Hamano2017-07-122-1/+10
| * | | | | | | | | | | | Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano2017-07-123-7/+54
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/typofix-commit-c-comment' into maintJunio C Hamano2017-07-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reflog-walk-maint' into maintJunio C Hamano2017-07-123-12/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Hopefully the last batch before -rc0Junio C Hamano2017-07-121-0/+9
* | | | | | | | | | | | | | | Merge branch 'ks/fix-rebase-doc-picture'Junio C Hamano2017-07-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | doc: correct a mistake in an illustrationks/fix-rebase-doc-pictureKaartic Sivaraam2017-07-101-1/+1
* | | | | | | | | | | | | | | Merge branch 'rs/wt-status-cleanup'Junio C Hamano2017-07-121-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | wt-status: use separate variable for result of shorten_unambiguous_refrs/wt-status-cleanupRené Scharfe2017-07-101-3/+4
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'rs/use-div-round-up'Junio C Hamano2017-07-129-15/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | use DIV_ROUND_UPrs/use-div-round-upRené Scharfe2017-07-109-15/+14
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-07-123-7/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | ref-filter.c: drop return from void functionkn/ref-filter-branch-listAlejandro R. Sedeño2017-07-101-1/+1
| * | | | | | | | | | | | | | branch: set remote color in ref-filter branch immediatelyJeff King2017-07-091-5/+6
| * | | | | | | | | | | | | | branch: use BRANCH_COLOR_LOCAL in ref-filter formatJeff King2017-07-092-2/+47
| * | | | | | | | | | | | | | branch: only perform HEAD check for local branchesJeff King2017-07-091-1/+2
* | | | | | | | | | | | | | | Merge branch 'rs/urlmatch-cleanup'Junio C Hamano2017-07-121-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | urlmatch: use hex2chr() in append_normalized_escapes()rs/urlmatch-cleanupRené Scharfe2017-07-091-5/+5
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano2017-07-121-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | apply: use strcmp(3) for comparing strings in gitdiff_verify_name()rs/apply-avoid-over-readingRené Scharfe2017-07-091-2/+1