Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/sha1dc' | Junio C Hamano | 2017-03-24 | 1 | -2/+17 |
|\ | |||||
| * | Makefile: make DC_SHA1 the default | Junio C Hamano | 2017-03-17 | 1 | -6/+10 |
| * | t0013: add a basic sha1 collision detection test | Jeff King | 2017-03-17 | 1 | -0/+1 |
| * | Makefile: add DC_SHA1 knob | Jeff King | 2017-03-17 | 1 | -0/+10 |
* | | Merge branch 'bc/sha1-header-selection-with-cpp-macros' | Junio C Hamano | 2017-03-17 | 1 | -7/+5 |
|\| | |||||
| * | hash.h: move SHA-1 implementation selection into a header file | brian m. carlson | 2017-03-15 | 1 | -7/+5 |
* | | Merge branch 'jk/interop-test' | Junio C Hamano | 2017-03-17 | 1 | -0/+3 |
|\ \ | |||||
| * | | t: add an interoperability test harness | Jeff King | 2017-03-10 | 1 | -0/+3 |
| |/ | |||||
* | | Merge branch 'rj/remove-unused-mktemp' | Junio C Hamano | 2017-03-10 | 1 | -5/+0 |
|\ \ | |||||
| * | | wrapper.c: remove unused gitmkstemps() function | Ramsay Jones | 2017-02-28 | 1 | -5/+0 |
| |/ | |||||
* | | Merge branch 'js/rebase-helper' | Junio C Hamano | 2017-02-27 | 1 | -0/+1 |
|\ \ | |||||
| * | | rebase--helper: add a builtin helper for interactive rebases | Johannes Schindelin | 2017-02-09 | 1 | -0/+1 |
| |/ | |||||
* / | add oidset API | Jeff King | 2017-02-09 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'bc/use-asciidoctor-opt' | Junio C Hamano | 2017-02-02 | 1 | -0/+6 |
|\ | |||||
| * | Makefile: add a knob to enable the use of Asciidoctor | brian m. carlson | 2017-01-23 | 1 | -0/+6 |
* | | Merge branch 'js/retire-relink' | Junio C Hamano | 2017-02-02 | 1 | -1/+0 |
|\ \ | |||||
| * | | relink: retire the command | Johannes Schindelin | 2017-01-25 | 1 | -1/+0 |
| |/ | |||||
* | | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-01-31 | 1 | -1/+1 |
|\ \ | |||||
| * | | difftool: retire the scripted version | Johannes Schindelin | 2017-01-19 | 1 | -1/+0 |
| * | | difftool: add a skeleton for the upcoming builtin | Johannes Schindelin | 2017-01-17 | 1 | -1/+2 |
| |/ | |||||
* | | Merge branch 'rs/qsort-s' | Junio C Hamano | 2017-01-31 | 1 | -0/+8 |
|\ \ | |||||
| * | | compat: add qsort_s() | René Scharfe | 2017-01-23 | 1 | -0/+8 |
| |/ | |||||
* | | Makefile: put LIBS after LDFLAGS for imap-send | Steven Penny | 2017-01-09 | 1 | -1/+1 |
* | | Makefile: POSIX windres | Steven Penny | 2017-01-09 | 1 | -1/+1 |
* | | Merge branch 'va/i18n-perl-scripts' | Junio C Hamano | 2016-12-27 | 1 | -1/+2 |
|\ \ | |||||
| * | | i18n: add--interactive: mark patch prompt for translation | Vasco Almeida | 2016-12-14 | 1 | -1/+1 |
| * | | i18n: add--interactive: mark plural strings | Vasco Almeida | 2016-12-14 | 1 | -1/+2 |
* | | | Merge branch 'jk/make-tags-find-sources-tweak' | Junio C Hamano | 2016-12-19 | 1 | -3/+16 |
|\ \ \ | |||||
| * | | | Makefile: exclude contrib from FIND_SOURCE_FILES | Jeff King | 2016-12-14 | 1 | -0/+2 |
| * | | | Makefile: match shell scripts in FIND_SOURCE_FILES | Jeff King | 2016-12-14 | 1 | -1/+3 |
| * | | | Makefile: exclude test cruft from FIND_SOURCE_FILES | Jeff King | 2016-12-14 | 1 | -1/+7 |
| * | | | Makefile: reformat FIND_SOURCE_FILES | Jeff King | 2016-12-14 | 1 | -3/+6 |
| | |/ | |/| | |||||
* / | | xdiff: drop XDL_FAST_HASH | Jeff King | 2016-12-06 | 1 | -9/+0 |
|/ / | |||||
* | | Merge branch 'ls/macos-update' | Junio C Hamano | 2016-11-11 | 1 | -0/+1 |
|\ \ | |||||
| * | | Makefile: set NO_OPENSSL on macOS by default | Lars Schneider | 2016-11-10 | 1 | -0/+1 |
| * | | Merge branch 'jk/common-main' into maint | Junio C Hamano | 2016-09-09 | 1 | -4/+13 |
| |\ \ | |||||
* | \ \ | Merge branch 'jk/quarantine-received-objects' | Junio C Hamano | 2016-10-17 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | tmp-objdir: introduce API for temporary object directories | Jeff King | 2016-10-10 | 1 | -0/+1 |
* | | | | | coccicheck: use --all-includes by default | René Scharfe | 2016-09-30 | 1 | -1/+2 |
|/ / / / | |||||
* | | | | Merge branch 'js/regexec-buf' | Junio C Hamano | 2016-09-27 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | regex: add regexec_buf() that can work on a non NUL-terminated string | Johannes Schindelin | 2016-09-21 | 1 | -1/+2 |
* | | | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-09-27 | 1 | -0/+14 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | add coccicheck make target | René Scharfe | 2016-09-15 | 1 | -0/+14 |
* | | | | | Merge branch 'cc/apply-am' | Junio C Hamano | 2016-09-19 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/apply: move init_apply_state() to apply.c | Christian Couder | 2016-08-11 | 1 | -0/+1 |
* | | | | | | Merge branch 'rs/compat-strdup' | Junio C Hamano | 2016-09-13 | 1 | -3/+14 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | compat: move strdup(3) replacement to its own file | René Scharfe | 2016-09-07 | 1 | -3/+14 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-08-08 | 1 | -10/+2 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'ew/build-time-pager-tweaks' | Junio C Hamano | 2016-08-08 | 1 | -1/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pager: move pager-specific setup into the build | Eric Wong | 2016-08-04 | 1 | -1/+20 |
| |/ / / / / |