summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* parse-options: automatically infer PARSE_OPT_LITERAL_ARGHELPRené Scharfe2018-08-038-14/+10
* shortlog: correct option help for -wRené Scharfe2018-08-031-2/+4
* send-pack: specify --force-with-lease argument help explicitlyRené Scharfe2018-08-031-2/+3
* pack-objects: specify --index-version argument help explicitlyRené Scharfe2018-08-031-2/+2
* difftool: remove angular brackets from argument helpRené Scharfe2018-08-031-2/+2
* add, update-index: fix --chmod argument helpRené Scharfe2018-08-032-2/+4
* push: use PARSE_OPT_LITERAL_ARGHELP instead of unbalanced bracketsÆvar Arnfjörð Bjarmason2018-08-031-2/+2
* Sync with Git 2.15.2Junio C Hamano2018-05-222-11/+44
|\
| * Sync with Git 2.14.4Junio C Hamano2018-05-222-11/+44
| |\
| | * Sync with Git 2.13.7Junio C Hamano2018-05-222-11/+44
| | |\
| | | * verify_path: disallow symlinks in .gitmodulesJeff King2018-05-211-3/+3
| | | * update-index: stat updated files earlierJeff King2018-05-211-8/+17
| | | * submodule-config: verify submodule names as pathsJeff King2018-05-211-0/+24
* | | | Merge branch 'jk/cached-commit-buffer' into maintJunio C Hamano2018-03-221-1/+1
|\ \ \ \
| * | | | commit: drop uses of get_cached_commit_buffer()Jeff King2018-02-221-1/+1
* | | | | Merge branch 'sm/mv-dry-run-update' into maintJunio C Hamano2018-03-221-2/+1
|\ \ \ \ \
| * | | | | mv: remove unneeded 'if (!show_only)'sm/mv-dry-run-updateStefan Moch2018-02-071-2/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'jc/worktree-add-short-help' into maintJunio C Hamano2018-03-221-1/+1
|\ \ \ \ \
| * | | | | worktree: say that "add" takes an arbitrary commit in short-helpjc/worktree-add-short-helpJunio C Hamano2018-01-171-1/+1
* | | | | | Merge branch 'rs/describe-unique-abbrev' into maintJunio C Hamano2018-03-221-1/+1
|\ \ \ \ \ \
| * | | | | | describe: use strbuf_add_unique_abbrev() for adding short hashesrs/describe-unique-abbrevRené Scharfe2018-01-161-1/+1
* | | | | | | Merge branch 'jt/fsck-code-cleanup' into maintJunio C Hamano2018-03-221-1/+7
|\ \ \ \ \ \ \
| * | | | | | | fsck: fix leak when traversing treesjt/fsck-code-cleanupEric Wong2018-01-231-1/+7
* | | | | | | | Merge branch 'ab/commit-m-with-fixup' into maintJunio C Hamano2018-02-271-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: add support for --fixup <commit> -m"<extra message>"ab/commit-m-with-fixupÆvar Arnfjörð Bjarmason2017-12-221-3/+5
* | | | | | | | | Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano2018-02-271-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Use DIFF_DETECT_RENAME for detect_rename assignmentsNguyễn Thái Ngọc Duy2017-12-271-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jk/abort-clone-with-existing-dest' into maintJunio C Hamano2018-02-151-7/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: do not clean up directories we didn't createjk/abort-clone-with-existing-destJeff King2018-01-031-4/+16
| * | | | | | | | clone: factor out dir_exists() helperJeff King2018-01-031-3/+8
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'rs/lose-leak-pending' into maintJunio C Hamano2018-02-151-12/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: avoid using the rev_info flag leak_pendingRené Scharfe2017-12-281-12/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'dk/describe-all-output-fix' into maintJunio C Hamano2018-02-151-2/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | describe: prepend "tags/" when describing tags with embedded namedk/describe-all-output-fixDaniel Knittl-Frank2017-12-271-2/+5
| |/ / / / / /
* | | | | | | 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
| | |/ / / / / / / / | |/| | | | | | | |