Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/cached-commit-buffer' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+1 |
|\ | |||||
| * | commit: drop uses of get_cached_commit_buffer() | Jeff King | 2018-02-22 | 1 | -1/+1 |
* | | Merge branch 'sm/mv-dry-run-update' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+1 |
|\ \ | |||||
| * | | mv: remove unneeded 'if (!show_only)' | Stefan Moch | 2018-02-07 | 1 | -2/+1 |
* | | | Merge branch 'jc/worktree-add-short-help' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | worktree: say that "add" takes an arbitrary commit in short-help | Junio C Hamano | 2018-01-17 | 1 | -1/+1 |
* | | | | Merge branch 'rs/describe-unique-abbrev' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | describe: use strbuf_add_unique_abbrev() for adding short hashes | René Scharfe | 2018-01-16 | 1 | -1/+1 |
* | | | | | Merge branch 'jt/fsck-code-cleanup' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+7 |
|\ \ \ \ \ | |||||
| * | | | | | fsck: fix leak when traversing trees | Eric Wong | 2018-01-23 | 1 | -1/+7 |
* | | | | | | Merge branch 'ab/commit-m-with-fixup' into maint | Junio C Hamano | 2018-02-27 | 1 | -3/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit: add support for --fixup <commit> -m"<extra message>" | Ævar Arnfjörð Bjarmason | 2017-12-22 | 1 | -3/+5 |
* | | | | | | | Merge branch 'nd/ita-wt-renames-in-status' into maint | Junio C Hamano | 2018-02-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Use DIFF_DETECT_RENAME for detect_rename assignments | Nguyễn Thái Ngọc Duy | 2017-12-27 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jk/abort-clone-with-existing-dest' into maint | Junio C Hamano | 2018-02-16 | 1 | -7/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | clone: do not clean up directories we didn't create | Jeff King | 2018-01-03 | 1 | -4/+16 |
| * | | | | | | | clone: factor out dir_exists() helper | Jeff King | 2018-01-03 | 1 | -3/+8 |
* | | | | | | | | Merge branch 'rs/lose-leak-pending' into maint | Junio C Hamano | 2018-02-16 | 1 | -12/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout: avoid using the rev_info flag leak_pending | René Scharfe | 2017-12-28 | 1 | -12/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'dk/describe-all-output-fix' into maint | Junio C Hamano | 2018-02-16 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | describe: prepend "tags/" when describing tags with embedded name | Daniel Knittl-Frank | 2017-12-27 | 1 | -2/+5 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ew/empty-merge-with-dirty-index' | Junio C Hamano | 2018-01-05 | 1 | -37/+0 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with... | Junio C Hamano | 2017-12-22 | 1 | -37/+0 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | move index_has_changes() from builtin/am.c to merge.c for reuse | Elijah Newren | 2017-12-22 | 1 | -37/+0 |
| | |/ / / / / | |||||
* | | | | | | | Merge branch 'sb/describe-blob' | Junio C Hamano | 2017-12-28 | 1 | -27/+94 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | builtin/describe.c: describe a blob | Stefan Beller | 2017-12-19 | 1 | -5/+57 |
| * | | | | | | | builtin/describe.c: factor out describe_commit | Stefan Beller | 2017-11-16 | 1 | -26/+37 |
| * | | | | | | | builtin/describe.c: print debug statements earlier | Stefan Beller | 2017-11-16 | 1 | -1/+4 |
| * | | | | | | | builtin/describe.c: rename `oid` to avoid variable shadowing | Stefan Beller | 2017-11-16 | 1 | -4/+4 |
* | | | | | | | | Merge branch 'hi/merge-verify-sig-config' | Junio C Hamano | 2017-12-28 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge: add config option for verifySignatures | Hans Jerry Illikainen | 2017-12-12 | 1 | -0/+2 |
* | | | | | | | | | Merge branch 'jt/transport-hide-vtable' | Junio C Hamano | 2017-12-28 | 2 | -6/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | clone, fetch: remove redundant transport check | Jonathan Tan | 2017-12-14 | 2 | -6/+0 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'cc/skip-to-optional-val' | Junio C Hamano | 2017-12-28 | 1 | -8/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | index-pack: use skip_to_optional_arg() | Christian Couder | 2017-12-12 | 1 | -8/+3 |
* | | | | | | | | | | Merge branch 'ot/pretty' | Junio C Hamano | 2017-12-27 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | format: create pretty.h file | Olga Telezhnaya | 2017-12-12 | 3 | -3/+3 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'tz/notes-error-to-stderr' into maint | Junio C Hamano | 2017-12-06 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'sw/pull-ipv46-passthru' into maint | Junio C Hamano | 2017-12-06 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ma/reduce-heads-leakfix' into maint | Junio C Hamano | 2017-11-27 | 5 | -22/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ma/bisect-leakfix' into maint | Junio C Hamano | 2017-11-27 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/check-ref-format-oor' into maint | Junio C Hamano | 2017-11-15 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bw/grep-recurse-submodules' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ao/check-resolve-ref-unsafe-result' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bw/submodule-sans-cache-compat' | Junio C Hamano | 2017-12-27 | 3 | -3/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | submodule: convert get_next_submodule to not rely on the_index | Brandon Williams | 2017-12-12 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | | | | submodule: convert stage_updated_gitmodules to take a struct index_state | Brandon Williams | 2017-12-12 | 2 | -2/+2 |
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'es/clone-shared-worktree' | Junio C Hamano | 2017-12-27 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | clone: support 'clone --shared' from a worktree | Eric Sunshine | 2017-12-12 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jt/decorate-api' | Junio C Hamano | 2017-12-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |