Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ew/autoconf-pthread' | Junio C Hamano | 2016-07-25 | 1 | -0/+5 |
|\ | |||||
| * | configure.ac: stronger test for pthread linkageew/autoconf-pthread | Eric Wong | 2016-07-18 | 1 | -0/+5 |
* | | Merge branch 'mh/blame-worktree' | Junio C Hamano | 2016-07-25 | 2 | -18/+71 |
|\ \ | |||||
| * | | t/t8003-blame-corner-cases.sh: Use here documents | Mike Hommey | 2016-07-18 | 1 | -17/+17 |
| * | | blame: allow to blame paths freshly added to the index | Mike Hommey | 2016-07-18 | 2 | -1/+54 |
* | | | Merge branch 'js/fsck-name-object' | Junio C Hamano | 2016-07-25 | 5 | -31/+200 |
|\ \ \ | |||||
| * | | | fsck: optionally show more helpful info for broken links | Johannes Schindelin | 2016-07-18 | 4 | -9/+85 |
| * | | | fsck: give the error function a chance to see the fsck_options | Johannes Schindelin | 2016-07-18 | 3 | -5/+9 |
| * | | | fsck_walk(): optionally name objects on the go | Johannes Schindelin | 2016-07-18 | 2 | -4/+84 |
| * | | | fsck: refactor how to describe objects | Johannes Schindelin | 2016-07-18 | 1 | -14/+23 |
* | | | | Merge branch 'nd/cache-tree-ita' | Junio C Hamano | 2016-07-25 | 15 | -53/+87 |
|\ \ \ \ | |||||
| * | | | | cache-tree: do not generate empty trees as a result of all i-t-a subentriesnd/cache-tree-ita | Nguyễn Thái Ngọc Duy | 2016-07-18 | 2 | -1/+23 |
| * | | | | cache-tree.c: fix i-t-a entry skipping directory updates sometimes | Nguyễn Thái Ngọc Duy | 2016-07-18 | 2 | -2/+19 |
| * | | | | test-lib.sh: introduce and use $EMPTY_BLOB | Nguyễn Thái Ngọc Duy | 2016-07-18 | 8 | -38/+35 |
| * | | | | test-lib.sh: introduce and use $EMPTY_TREE | Nguyễn Thái Ngọc Duy | 2016-07-18 | 6 | -13/+11 |
* | | | | | Merge branch 'jk/push-scrub-url' | Junio C Hamano | 2016-07-25 | 2 | -2/+14 |
|\ \ \ \ \ | |||||
| * | | | | | t5541: fix url scrubbing test when GPG is not setjk/push-scrub-url | Jeff King | 2016-07-20 | 1 | -2/+4 |
| * | | | | | push: anonymize URL in status output | Jeff King | 2016-07-14 | 2 | -2/+12 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'nd/test-helpers' | Junio C Hamano | 2016-07-25 | 2 | -11/+3 |
|\ \ \ \ \ | |||||
| * | | | | | t/test-lib.sh: fix running tests with --valgrind | Johannes Schindelin | 2016-07-11 | 1 | -1/+1 |
| * | | | | | Makefile: use VCSSVN_LIB to refer to svn library | Jeff King | 2016-07-06 | 1 | -2/+2 |
| * | | | | | Makefile: drop extra dependencies for test helpers | Jeff King | 2016-07-06 | 1 | -8/+0 |
* | | | | | | Merge branch 'jc/doc-diff-filter-exclude' | Junio C Hamano | 2016-07-25 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: document diff-filter exclusionjc/doc-diff-filter-exclude | Junio C Hamano | 2016-07-14 | 1 | -0/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'ls/travis-enable-httpd-tests' | Junio C Hamano | 2016-07-25 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | travis-ci: enable web server tests t55xx on Linuxls/travis-enable-httpd-tests | Lars Schneider | 2016-07-12 | 1 | -0/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' | Junio C Hamano | 2016-07-25 | 10 | -90/+112 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: avoid "safer crlf" during recording of merge results | Junio C Hamano | 2016-07-12 | 4 | -31/+43 |
| * | | | | | | convert: unify the "auto" handling of CRLF | Torsten Bögershausen | 2016-07-06 | 7 | -59/+69 |
* | | | | | | | Merge branch 'rs/worktree-use-strbuf-absolute-path' | Junio C Hamano | 2016-07-25 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | worktree: use strbuf_add_absolute_path() directlyrs/worktree-use-strbuf-absolute-path | René Scharfe | 2016-07-12 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'rs/rm-strbuf-optim' | Junio C Hamano | 2016-07-25 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rm: reuse strbuf for all remove_dir_recursively() callsrs/rm-strbuf-optim | René Scharfe | 2016-07-12 | 1 | -2/+3 |
* | | | | | | | | | Merge branch 'rw/make-needs-librt' | Junio C Hamano | 2016-07-25 | 2 | -3/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | config.mak.uname: define NEEDS_LIBRT under Linux, for nowrw/make-needs-librt | Eric Wong | 2016-07-11 | 1 | -0/+2 |
| * | | | | | | | | | Makefile: add NEEDS_LIBRT to optionally link with librt | Ronald Wampler | 2016-07-07 | 1 | -3/+9 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'js/ignore-space-at-eol' | Junio C Hamano | 2016-07-25 | 3 | -3/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | diff: fix a double off-by-one with --ignore-space-at-eoljs/ignore-space-at-eol | Johannes Schindelin | 2016-07-11 | 3 | -4/+6 |
| * | | | | | | | | | diff: demonstrate a bug with --patience and --ignore-space-at-eol | Johannes Schindelin | 2016-07-11 | 1 | -0/+8 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mh/ref-iterators' | Junio C Hamano | 2016-07-25 | 11 | -324/+1460 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | for_each_reflog(): reimplement using iteratorsmh/ref-iterators | Michael Haggerty | 2016-06-20 | 2 | -42/+78 |
| * | | | | | | | | | dir_iterator: new API for iterating over a directory tree | Michael Haggerty | 2016-06-20 | 3 | -0/+290 |
| * | | | | | | | | | for_each_reflog(): don't abort for bad references | Michael Haggerty | 2016-06-20 | 1 | -1/+1 |
| * | | | | | | | | | do_for_each_ref(): reimplement using reference iteration | Michael Haggerty | 2016-06-20 | 4 | -213/+77 |
| * | | | | | | | | | refs: introduce an iterator interface | Michael Haggerty | 2016-06-20 | 6 | -1/+915 |
| * | | | | | | | | | ref_resolves_to_object(): new function | Michael Haggerty | 2016-06-20 | 1 | -7/+20 |
| * | | | | | | | | | entry_resolves_to_object(): rename function from ref_resolves_to_object() | Michael Haggerty | 2016-06-20 | 1 | -3/+3 |
| * | | | | | | | | | get_ref_cache(): only create an instance if there is a submodule | Michael Haggerty | 2016-06-20 | 1 | -11/+22 |
| * | | | | | | | | | remote rm: handle symbolic refs correctly | Michael Haggerty | 2016-06-20 | 1 | -5/+1 |
| * | | | | | | | | | delete_refs(): add a flags argument | Michael Haggerty | 2016-06-20 | 4 | -7/+8 |