summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'rs/swap'Junio C Hamano2017-02-152-9/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | use SWAP macroRené Scharfe2017-01-302-9/+4
* | | | | | | | | Merge branch 'js/difftool-builtin'Junio C Hamano2017-02-101-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | difftool: fix bug when printing usageDavid Aguilar2017-02-061-4/+4
* | | | | | | | | | Merge branch 'ps/worktree-prune-help-fix'Junio C Hamano2017-02-101-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | worktree: fix option descriptions for `prune`ps/worktree-prune-help-fixPatrick Steinhardt2017-02-061-2/+2
* | | | | | | | | | | Merge branch 'cw/log-updates-for-all-refs-really'Junio C Hamano2017-02-032-5/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | refs: add option core.logAllRefUpdates = alwaysCornelius Weig2017-01-312-5/+8
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rs/object-id'Junio C Hamano2017-02-034-6/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | checkout: convert post_checkout_hook() to struct object_idRené Scharfe2017-01-301-2/+2
| * | | | | | | | | | | use oid_to_hex_r() for converting struct object_id hashes to hex stringsRené Scharfe2017-01-303-4/+4
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'sb/unpack-trees-super-prefix'Junio C Hamano2017-02-031-18/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | read-tree: use OPT_BOOL instead of OPT_SET_INTStefan Beller2017-01-111-18/+18
* | | | | | | | | | | | Merge branch 'ep/commit-static-buf-cleanup'Junio C Hamano2017-02-021-17/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | builtin/commit.c: switch to strbuf, instead of snprintf()ep/commit-static-buf-cleanupElia Pinto2017-01-311-6/+4
| * | | | | | | | | | | | builtin/commit.c: remove the PATH_MAX limitation via dynamic allocationElia Pinto2017-01-131-11/+10
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'rs/receive-pack-cleanup'Junio C Hamano2017-02-021-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | receive-pack: call string_list_clear() unconditionallyrs/receive-pack-cleanupRené Scharfe2017-01-301-2/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maintJunio C Hamano2017-01-171-3/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/push-default-explicit' into maintJunio C Hamano2017-01-171-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano2017-01-171-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/sequencer-abort-safety' into maintJunio C Hamano2017-01-171-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/pull-rebase-ff' into maintJunio C Hamano2017-01-171-4/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/commit-only-allow-empty' into maintJunio C Hamano2017-01-171-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/worktree-list-fixup' into maintJunio C Hamano2017-01-172-7/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-parse-symbolic-parents-fix' into maintJunio C Hamano2017-01-171-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rs/absolute-pathdup'Junio C Hamano2017-02-022-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | use absolute_pathdup()rs/absolute-pathdupRené Scharfe2017-01-272-3/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/fsck-connectivity-check-fix'Junio C Hamano2017-01-311-37/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | fsck: lazily load types under --connectivity-onlyjk/fsck-connectivity-check-fixJeff King2017-01-261-51/+7
| * | | | | | | | | | | | | | | | | | | fsck: move typename() printing to its own functionJeff King2017-01-261-9/+20
| * | | | | | | | | | | | | | | | | | | fsck: check HAS_OBJ more consistentlyJeff King2017-01-171-2/+2
| * | | | | | | | | | | | | | | | | | | fsck: do not fallback "git fsck <bogus>" to "git fsck"Jeff King2017-01-171-1/+1
| * | | | | | | | | | | | | | | | | | | fsck: tighten error-checks of "git fsck <head>"Jeff King2017-01-171-2/+5
| * | | | | | | | | | | | | | | | | | | fsck: prepare dummy objects for --connectivity-checkJeff King2017-01-171-23/+97
| * | | | | | | | | | | | | | | | | | | fsck: report trees as danglingJeff King2017-01-171-1/+1
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'js/difftool-builtin'Junio C Hamano2017-01-311-0/+692
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | difftool: hack around -Wzero-length-format warningJeff King2017-01-251-1/+1
| * | | | | | | | | | | | | | | | | | difftool: retire the scripted versionJohannes Schindelin2017-01-191-41/+0
| * | | | | | | | | | | | | | | | | | difftool: implement the functionality in the builtinJohannes Schindelin2017-01-191-1/+671
| * | | | | | | | | | | | | | | | | | difftool: add a skeleton for the upcoming builtinJohannes Schindelin2017-01-171-0/+63
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'vp/show-ref-verify-head'Junio C Hamano2017-01-311-28/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | show-ref: remove a stale commentvp/show-ref-verify-headJunio C Hamano2017-01-231-4/+0
| * | | | | | | | | | | | | | | | | | show-ref: remove dead `if (verify)' checkVladimir Panteleev2017-01-231-3/+0
| * | | | | | | | | | | | | | | | | | show-ref: detect dangling refs under --verify as wellVladimir Panteleev2017-01-231-8/+8
| * | | | | | | | | | | | | | | | | | show-ref: move --quiet handling into show_one()Vladimir Panteleev2017-01-231-5/+4
| * | | | | | | | | | | | | | | | | | show-ref: allow -d to work with --verifyVladimir Panteleev2017-01-231-11/+12
| * | | | | | | | | | | | | | | | | | show-ref: accept HEAD with --verifyVladimir Panteleev2017-01-231-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'js/remote-rename-with-half-configured-remote'Junio C Hamano2017-01-312-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | remote rename: more carefully determine whether a remote is configuredjs/remote-rename-with-half-configured-remoteJohannes Schindelin2017-01-192-8/+8
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
View Lorry Controller Status