summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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)'Stefan 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-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 hashesRené Scharfe2018-01-161-1/+1
* | | | | Merge branch 'jt/fsck-code-cleanup' into maintJunio C Hamano2018-03-221-1/+7
|\ \ \ \ \
| * | | | | fsck: fix leak when traversing treesEric 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>"Æ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-161-7/+24
|\ \ \ \ \ \ \
| * | | | | | | clone: do not clean up directories we didn't createJeff 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-161-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-161-2/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | describe: prepend "tags/" when describing tags with embedded nameDaniel 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-121-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_indexBrandon 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 worktreeEric Sunshine2017-12-121-1/+2
* | | | | | | | | | | | | | | | | | Merge branch 'jt/decorate-api'Junio C Hamano2017-12-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \