summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* builtin/blame: add new coloring scheme configStefan Beller2018-04-241-0/+18
* builtin/blame: highlight recently changed linesStefan Beller2018-04-241-4/+76
* builtin/blame: dim uninteresting metadata linesStefan Beller2018-04-241-4/+35
* Merge branch 'ew/empty-merge-with-dirty-index'Junio C Hamano2018-01-051-37/+0
|\
| * Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano2017-12-221-37/+0
| |\
| | * move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren2017-12-221-37/+0
* | | Merge branch 'sb/describe-blob'Junio C Hamano2017-12-281-27/+94
|\ \ \
| * | | builtin/describe.c: describe a blobStefan Beller2017-12-191-5/+57
| * | | builtin/describe.c: factor out describe_commitStefan Beller2017-11-161-26/+37
| * | | builtin/describe.c: print debug statements earlierStefan Beller2017-11-161-1/+4
| * | | builtin/describe.c: rename `oid` to avoid variable shadowingStefan Beller2017-11-161-4/+4
* | | | Merge branch 'hi/merge-verify-sig-config'Junio C Hamano2017-12-281-0/+2
|\ \ \ \
| * | | | merge: add config option for verifySignaturesHans Jerry Illikainen2017-12-121-0/+2
* | | | | Merge branch 'jt/transport-hide-vtable'Junio C Hamano2017-12-282-6/+0
|\ \ \ \ \
| * | | | | clone, fetch: remove redundant transport checkJonathan Tan2017-12-142-6/+0
| | |_|_|/ | |/| | |
* | | | | Merge branch 'cc/skip-to-optional-val'Junio C Hamano2017-12-281-8/+3
|\ \ \ \ \
| * | | | | index-pack: use skip_to_optional_arg()Christian Couder2017-12-111-8/+3
* | | | | | Merge branch 'ot/pretty'Junio C Hamano2017-12-273-3/+3
|\ \ \ \ \ \
| * | | | | | format: create pretty.h fileOlga Telezhnaya2017-12-123-3/+3
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'tz/notes-error-to-stderr' into maintJunio C Hamano2017-12-061-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sw/pull-ipv46-passthru' into maintJunio C Hamano2017-12-061-0/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ma/reduce-heads-leakfix' into maintJunio C Hamano2017-11-275-22/+28
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ma/bisect-leakfix' into maintJunio C Hamano2017-11-271-2/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/check-ref-format-oor' into maintJunio C Hamano2017-11-151-2/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bw/grep-recurse-submodules' into maintJunio C Hamano2017-11-151-0/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ao/check-resolve-ref-unsafe-result' into maintJunio C Hamano2017-11-151-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/submodule-sans-cache-compat'Junio C Hamano2017-12-273-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | submodule: convert get_next_submodule to not rely on the_indexbw/submodule-sans-cache-compatBrandon Williams2017-12-121-1/+3
| * | | | | | | | | | | | | submodule: convert stage_updated_gitmodules to take a struct index_stateBrandon Williams2017-12-122-2/+2
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'es/clone-shared-worktree'Junio C Hamano2017-12-271-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clone: support 'clone --shared' from a worktreees/clone-shared-worktreeEric Sunshine2017-12-111-1/+2
* | | | | | | | | | | | | | Merge branch 'jt/decorate-api'Junio C Hamano2017-12-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | decorate: clean up and document APIjt/decorate-apiJonathan Tan2017-12-081-1/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ks/branch-cleanup'Junio C Hamano2017-12-272-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | builtin/branch: strip refs/heads/ using skip_prefixks/branch-cleanupKaartic Sivaraam2017-12-071-4/+11
| * | | | | | | | | | | | | | branch: update warning message shown when copying a misnamed branchKaartic Sivaraam2017-12-071-1/+1
| * | | | | | | | | | | | | | branch: group related arguments of create_branch()Kaartic Sivaraam2017-12-072-2/+2
* | | | | | | | | | | | | | | Merge branch 'rs/fmt-merge-msg-string-leak-fix'Junio C Hamano2017-12-271-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fmt-merge-msg: avoid leaking strbuf in shortlog()rs/fmt-merge-msg-string-leak-fixRené Scharfe2017-12-071-1/+2
* | | | | | | | | | | | | | | | Merge branch 'rs/am-builtin-leakfix'Junio C Hamano2017-12-271-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | am: release strbuf after use in split_mail_mbox()rs/am-builtin-leakfixRené Scharfe2017-12-071-3/+7
* | | | | | | | | | | | | | | | | Merge branch 'es/worktree-checkout-hook'Junio C Hamano2017-12-271-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | worktree: invoke post-checkout hook (unless --no-checkout)es/worktree-checkout-hookEric Sunshine2017-12-071-6/+16
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'lb/rebase-i-short-command-names'Junio C Hamano2017-12-271-10/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rebase -i: learn to abbreviate command namesLiam Beguin2017-12-051-0/+3
| * | | | | | | | | | | | | | | | | rebase -i -x: add exec commands via the rebase--helperLiam Beguin2017-12-051-1/+6
| * | | | | | | | | | | | | | | | | rebase -i: update functions to use a flags parameterLiam Beguin2017-12-051-6/+7
| * | | | | | | | | | | | | | | | | rebase -i: replace reference to sha1 with oidLiam Beguin2017-12-051-5/+5
| * | | | | | | | | | | | | | | | | rebase -i: refactor transform_todo_idsLiam Beguin2017-12-051-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jh/object-filtering'Junio C Hamano2017-12-272-3/+173
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
View Lorry Controller Status