summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge branch 'st/verify-tag'Junio C Hamano2017-01-312-13/+46
|\ \ \ \
| * | | | builtin/tag: add --format argument for tag -vLukas Puehringer2017-01-181-10/+27
| * | | | builtin/verify-tag: add --format to verify-tagSantiago Torres2017-01-171-3/+19
* | | | | Merge branch 'jk/loose-object-fsck'Junio C Hamano2017-01-311-13/+33
|\ \ \ \ \
| * | | | | fsck: parse loose object paths directlyJeff King2017-01-151-13/+33
| | |_|_|/ | |/| | |
* | | | | Merge branch 'bw/push-submodule-only'Junio C Hamano2017-01-311-0/+2
|\ \ \ \ \
| * | | | | push: add option to push only submodulesBrandon Williams2016-12-201-0/+2
* | | | | | Merge branch 'sb/submodule-init'Junio C Hamano2017-01-231-6/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | submodule update --init: display correct path from submodulesb/submodule-initStefan Beller2017-01-121-6/+7
* | | | | | Merge branch 'bw/pathspec-cleanup'Junio C Hamano2017-01-182-28/+38
|\ \ \ \ \ \
| * | | | | | ls-tree: convert show_recursive to use the pathspec struct interfaceBrandon Williams2017-01-081-9/+7
| * | | | | | mv: remove use of deprecated 'get_pathspec()'Brandon Williams2017-01-081-19/+31
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/blame-fixes'Junio C Hamano2017-01-181-10/+17
|\ \ \ \ \ \
| * | | | | | blame: output porcelain "previous" header for each filejk/blame-fixesJeff King2017-01-071-9/+14
| * | | | | | blame: handle --no-abbrevJeff King2017-01-071-0/+2
| * | | | | | blame: fix alignment with --abbrev=40Jeff King2017-01-071-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'dt/disable-bitmap-in-auto-gc'Junio C Hamano2017-01-182-1/+17
|\ \ \ \ \ \
| * | | | | | repack: die on incremental + write-bitmap-indexdt/disable-bitmap-in-auto-gcDavid Turner2016-12-291-0/+9
| * | | | | | auto gc: don't write bitmaps for incremental repacksDavid Turner2016-12-291-1/+8
| |/ / / / /
| * | | | | Merge branch 'jk/create-branch-remove-unused-param' into maintJunio C Hamano2016-11-292-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/commit-pptr-simplify' into maintJunio C Hamano2016-11-291-8/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/am-read-author-file' into maintJunio C Hamano2016-11-291-58/+45
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-283-5/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/reset-usage' into maintJunio C Hamano2016-10-281-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano2016-10-281-4/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano2016-10-281-0/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/clone-copy-alternates-fix' into maintJunio C Hamano2016-10-281-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/worktree-config' into maintJunio C Hamano2016-10-111-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/blame-abbrev' into maintJunio C Hamano2016-10-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/copy-array' into maintJunio C Hamano2016-10-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-tag-of-tag' into maintJunio C Hamano2016-10-031-1/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-294-36/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/checkout-disambiguation' into maintJunio C Hamano2016-09-291-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reduce-gc-aggressive-depth' into maintJunio C Hamano2016-09-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-291-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/checkout-some-states-are-const' into maintJunio C Hamano2016-09-291-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status