Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Makefile: help gettext tools to cope with our custom PRItime formatjc/po-pritime-fix | Junio C Hamano | 2017-07-20 | 1 | -0/+21 |
* | A few more topics before 2.14-rc1 | Junio C Hamano | 2017-07-18 | 1 | -19/+45 |
* | Merge branch 'jk/gc-pre-detach-under-hook' | Junio C Hamano | 2017-07-18 | 2 | -0/+25 |
|\ | |||||
| * | gc: run pre-detach operations under lockjk/gc-pre-detach-under-hook | Jeff King | 2017-07-12 | 2 | -0/+25 |
* | | Merge branch 'jn/hooks-pre-rebase-sample-fix' | Junio C Hamano | 2017-07-18 | 1 | -3/+3 |
|\ \ | |||||
| * | | pre-rebase hook: capture documentation in a <<here documentjn/hooks-pre-rebase-sample-fix | Jonathan Nieder | 2017-07-11 | 1 | -3/+3 |
* | | | Merge branch 'rs/progress-overall-throughput-at-the-end' | Junio C Hamano | 2017-07-18 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | progress: show overall rate in last updaters/progress-overall-throughput-at-the-end | René Scharfe | 2017-07-09 | 1 | -2/+6 |
* | | | | Merge branch 'tb/push-to-cygwin-unc-path' | Junio C Hamano | 2017-07-18 | 5 | -0/+27 |
|\ \ \ \ | |||||
| * | | | | cygwin: allow pushing to UNC pathstb/push-to-cygwin-unc-path | Torsten Bögershausen | 2017-07-05 | 5 | -0/+27 |
| |/ / / | |||||
* | | | | Git 2.14-rc0v2.14.0-rc0smap | Junio C Hamano | 2017-07-13 | 2 | -5/+13 |
* | | | | Merge branch 'jk/build-with-asan' | Junio C Hamano | 2017-07-13 | 2 | -3/+16 |
|\ \ \ \ | |||||
| * | | | | Makefile: disable unaligned loads with UBSan | Jeff King | 2017-07-10 | 1 | -0/+3 |
| * | | | | Makefile: turn off -fomit-frame-pointer with sanitizers | Jeff King | 2017-07-10 | 1 | -0/+1 |
| * | | | | Makefile: add helper for compiling with -fsanitize | Jeff King | 2017-07-10 | 1 | -0/+4 |
| * | | | | test-lib: turn on ASan abort_on_error by default | Jeff King | 2017-07-10 | 1 | -1/+1 |
| * | | | | test-lib: set ASAN_OPTIONS variable before we run git | Jeff King | 2017-07-10 | 1 | -3/+8 |
| |/ / / | |||||
* | | | | Merge branch 'sb/pull-rebase-submodule' | Junio C Hamano | 2017-07-13 | 8 | -41/+193 |
|\ \ \ \ | |||||
| * | | | | builtin/fetch cleanup: always set default value for submodule recursing | Stefan Beller | 2017-06-27 | 1 | -3/+2 |
| * | | | | pull: optionally rebase submodules (remote submodule changes only) | Stefan Beller | 2017-06-23 | 5 | -16/+157 |
| * | | | | builtin/fetch: parse recurse-submodules-default at default options parsing | Stefan Beller | 2017-06-23 | 1 | -9/+10 |
| * | | | | builtin/fetch: factor submodule recurse parsing out to submodule config | Stefan Beller | 2017-06-23 | 3 | -16/+27 |
* | | | | | Merge branch 'sb/hashmap-customize-comparison' | Junio C Hamano | 2017-07-13 | 20 | -409/+431 |
|\ \ \ \ \ | |||||
| * | | | | | hashmap: migrate documentation from Documentation/technical into headersb/hashmap-customize-comparison | Stefan Beller | 2017-06-30 | 2 | -341/+316 |
| * | | | | | patch-ids.c: use hashmap correctly | Stefan Beller | 2017-06-30 | 1 | -4/+4 |
| * | | | | | hashmap.h: compare function has access to a data field | Stefan Beller | 2017-06-30 | 19 | -66/+113 |
* | | | | | | Merge branch 'ab/grep-lose-opt-regflags' | Junio C Hamano | 2017-07-13 | 4 | -32/+35 |
|\ \ \ \ \ \ | |||||
| * | | | | | | grep: remove redundant REG_NEWLINE when compiling fixed regexab/grep-lose-opt-regflags | Ævar Arnfjörð Bjarmason | 2017-06-30 | 1 | -1/+1 |
| * | | | | | | grep: remove regflags from the public grep_opt API | Ævar Arnfjörð Bjarmason | 2017-06-30 | 4 | -14/+34 |
| * | | | | | | grep: remove redundant and verbose re-assignments to 0 | Ævar Arnfjörð Bjarmason | 2017-06-30 | 1 | -11/+0 |
| * | | | | | | grep: remove redundant "fixed" field re-assignment to 0 | Ævar Arnfjörð Bjarmason | 2017-06-30 | 1 | -2/+0 |
| * | | | | | | grep: adjust a redundant grep pattern type assignment | Ævar Arnfjörð Bjarmason | 2017-06-30 | 1 | -4/+1 |
| * | | | | | | grep: remove redundant double assignment to 0 | Ævar Arnfjörð Bjarmason | 2017-06-30 | 1 | -1/+0 |
| |/ / / / / | |||||
* | | | | | | Sync with v2.13.3 | Junio C Hamano | 2017-07-12 | 1 | -0/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Git 2.13.3v2.13.3 | Junio C Hamano | 2017-07-12 | 2 | -1/+10 |
| * | | | | | | Merge branch 'kn/ref-filter-branch-list' into maint | Junio C Hamano | 2017-07-12 | 3 | -7/+54 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ks/typofix-commit-c-comment' into maint | Junio C Hamano | 2017-07-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/reflog-walk-maint' into maint | Junio C Hamano | 2017-07-12 | 3 | -12/+42 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Hopefully the last batch before -rc0 | Junio C Hamano | 2017-07-12 | 1 | -0/+9 |
* | | | | | | | | | Merge branch 'ks/fix-rebase-doc-picture' | Junio C Hamano | 2017-07-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | doc: correct a mistake in an illustrationks/fix-rebase-doc-picture | Kaartic Sivaraam | 2017-07-10 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'rs/wt-status-cleanup' | Junio C Hamano | 2017-07-12 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | wt-status: use separate variable for result of shorten_unambiguous_refrs/wt-status-cleanup | René Scharfe | 2017-07-10 | 1 | -3/+4 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs/use-div-round-up' | Junio C Hamano | 2017-07-12 | 9 | -15/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | use DIV_ROUND_UPrs/use-div-round-up | René Scharfe | 2017-07-10 | 9 | -15/+14 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'kn/ref-filter-branch-list' | Junio C Hamano | 2017-07-12 | 3 | -7/+54 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | ref-filter.c: drop return from void functionkn/ref-filter-branch-list | Alejandro R. Sedeño | 2017-07-10 | 1 | -1/+1 |
| * | | | | | | | | | branch: set remote color in ref-filter branch immediately | Jeff King | 2017-07-09 | 1 | -5/+6 |
| * | | | | | | | | | branch: use BRANCH_COLOR_LOCAL in ref-filter format | Jeff King | 2017-07-09 | 2 | -2/+47 |
| * | | | | | | | | | branch: only perform HEAD check for local branches | Jeff King | 2017-07-09 | 1 | -1/+2 |