Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/strbuf-cleanup-in-rmdir-recursively' | Junio C Hamano | 2017-02-16 | 1 | -3/+3 |
|\ | |||||
| * | rm: reuse strbuf for all remove_dir_recursively() calls, againrs/strbuf-cleanup-in-rmdir-recursively | René Scharfe | 2017-02-13 | 1 | -3/+3 |
* | | Merge branch 'rs/ls-files-partial-optim' | Junio C Hamano | 2017-02-16 | 1 | -10/+11 |
|\ \ | |||||
| * | | ls-files: move only kept cache entries in prune_cache()rs/ls-files-partial-optim | René Scharfe | 2017-02-13 | 1 | -5/+4 |
| * | | ls-files: pass prefix length explicitly to prune_cache() | René Scharfe | 2017-02-13 | 1 | -5/+7 |
| * | | Merge branch 'jk/blame-fixes' into maint | Junio C Hamano | 2017-01-31 | 1 | -10/+17 |
| |\ \ | |||||
| * \ \ | Merge branch 'dt/disable-bitmap-in-auto-gc' into maint | Junio C Hamano | 2017-01-31 | 2 | -1/+17 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jc/compression-config' into maint | Junio C Hamano | 2017-01-31 | 1 | -14/+0 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'rs/swap' | Junio C Hamano | 2017-02-15 | 2 | -9/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use SWAP macro | René Scharfe | 2017-01-30 | 2 | -9/+4 |
* | | | | | | | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-02-10 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | difftool: fix bug when printing usage | David Aguilar | 2017-02-06 | 1 | -4/+4 |
* | | | | | | | | Merge branch 'ps/worktree-prune-help-fix' | Junio C Hamano | 2017-02-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | worktree: fix option descriptions for `prune`ps/worktree-prune-help-fix | Patrick Steinhardt | 2017-02-06 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'cw/log-updates-for-all-refs-really' | Junio C Hamano | 2017-02-03 | 2 | -5/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | refs: add option core.logAllRefUpdates = always | Cornelius Weig | 2017-01-31 | 2 | -5/+8 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rs/object-id' | Junio C Hamano | 2017-02-03 | 4 | -6/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | checkout: convert post_checkout_hook() to struct object_id | René Scharfe | 2017-01-30 | 1 | -2/+2 |
| * | | | | | | | | | use oid_to_hex_r() for converting struct object_id hashes to hex strings | René Scharfe | 2017-01-30 | 3 | -4/+4 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'sb/unpack-trees-super-prefix' | Junio C Hamano | 2017-02-03 | 1 | -18/+18 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | read-tree: use OPT_BOOL instead of OPT_SET_INT | Stefan Beller | 2017-01-11 | 1 | -18/+18 |
* | | | | | | | | | | Merge branch 'ep/commit-static-buf-cleanup' | Junio C Hamano | 2017-02-02 | 1 | -17/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | builtin/commit.c: switch to strbuf, instead of snprintf()ep/commit-static-buf-cleanup | Elia Pinto | 2017-01-31 | 1 | -6/+4 |
| * | | | | | | | | | | builtin/commit.c: remove the PATH_MAX limitation via dynamic allocation | Elia Pinto | 2017-01-13 | 1 | -11/+10 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'rs/receive-pack-cleanup' | Junio C Hamano | 2017-02-02 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | receive-pack: call string_list_clear() unconditionallyrs/receive-pack-cleanup | René Scharfe | 2017-01-30 | 1 | -2/+1 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maint | Junio C Hamano | 2017-01-17 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/push-default-explicit' into maint | Junio C Hamano | 2017-01-17 | 1 | -2/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/index-pack-wo-repo-from-stdin' into maint | Junio C Hamano | 2017-01-17 | 1 | -4/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/sequencer-abort-safety' into maint | Junio C Hamano | 2017-01-17 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/pull-rebase-ff' into maint | Junio C Hamano | 2017-01-17 | 1 | -4/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ak/commit-only-allow-empty' into maint | Junio C Hamano | 2017-01-17 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/worktree-list-fixup' into maint | Junio C Hamano | 2017-01-17 | 2 | -7/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-parse-symbolic-parents-fix' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/absolute-pathdup' | Junio C Hamano | 2017-02-02 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | use absolute_pathdup()rs/absolute-pathdup | René Scharfe | 2017-01-27 | 2 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fsck-connectivity-check-fix' | Junio C Hamano | 2017-01-31 | 1 | -37/+81 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | fsck: lazily load types under --connectivity-onlyjk/fsck-connectivity-check-fix | Jeff King | 2017-01-26 | 1 | -51/+7 |
| * | | | | | | | | | | | | | | | | | | | fsck: move typename() printing to its own function | Jeff King | 2017-01-26 | 1 | -9/+20 |
| * | | | | | | | | | | | | | | | | | | | fsck: check HAS_OBJ more consistently | Jeff King | 2017-01-17 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | fsck: do not fallback "git fsck <bogus>" to "git fsck" | Jeff King | 2017-01-17 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | fsck: tighten error-checks of "git fsck <head>" | Jeff King | 2017-01-17 | 1 | -2/+5 |
| * | | | | | | | | | | | | | | | | | | | fsck: prepare dummy objects for --connectivity-check | Jeff King | 2017-01-17 | 1 | -23/+97 |
| * | | | | | | | | | | | | | | | | | | | fsck: report trees as dangling | Jeff King | 2017-01-17 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-01-31 | 1 | -0/+692 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | difftool: hack around -Wzero-length-format warning | Jeff King | 2017-01-25 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | difftool: retire the scripted version | Johannes Schindelin | 2017-01-19 | 1 | -41/+0 |
| * | | | | | | | | | | | | | | | | | | difftool: implement the functionality in the builtin | Johannes Schindelin | 2017-01-19 | 1 | -1/+671 |
| * | | | | | | | | | | | | | | | | | | difftool: add a skeleton for the upcoming builtin | Johannes Schindelin | 2017-01-17 | 1 | -0/+63 |
| |/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'vp/show-ref-verify-head' | Junio C Hamano | 2017-01-31 | 1 | -28/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |