summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/cherry-pick-0-mainline'Junio C Hamano2017-03-171-1/+20
|\
| * cherry-pick: detect bogus arguments to --mainlinejk/cherry-pick-0-mainlineJeff King2017-03-151-1/+20
* | Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano2017-03-171-0/+7
|\ \
| * | rev-parse: add --show-superproject-working-treeStefan Beller2017-03-081-0/+7
* | | Merge branch 'bc/object-id'Junio C Hamano2017-03-1720-360/+357
|\ \ \
| * | | builtin/merge-base: convert to struct object_idbrian m. carlson2017-02-221-14/+14
| * | | Convert object iteration callbacks to struct object_idbrian m. carlson2017-02-226-27/+27
| * | | refs: convert each_reflog_ent_fn to struct object_idbrian m. carlson2017-02-223-12/+12
| * | | builtin/replace: convert to struct object_idbrian m. carlson2017-02-221-56/+56
| * | | Convert remaining callers of resolve_refdup to object_idbrian m. carlson2017-02-222-11/+11
| * | | builtin/merge: convert to struct object_idbrian m. carlson2017-02-221-68/+66
| * | | builtin/clone: convert to struct object_idbrian m. carlson2017-02-221-5/+5
| * | | builtin/branch: convert to struct object_idbrian m. carlson2017-02-221-13/+13
| * | | builtin/grep: convert to struct object_idbrian m. carlson2017-02-221-12/+12
| * | | builtin/fmt-merge-message: convert to struct object_idbrian m. carlson2017-02-221-35/+35
| * | | builtin/fast-export: convert to struct object_idbrian m. carlson2017-02-221-29/+29
| * | | builtin/describe: convert to struct object_idbrian m. carlson2017-02-221-25/+25
| * | | builtin/diff-tree: convert to struct object_idbrian m. carlson2017-02-221-32/+31
| * | | builtin/commit: convert to struct object_idbrian m. carlson2017-02-201-23/+23
* | | | Merge branch 'rs/blame-code-cleanup'Junio C Hamano2017-03-171-17/+8
|\ \ \ \
| * | | | blame: move blame_entry duplication to add_blame_entry()rs/blame-code-cleanupRené Scharfe2017-03-111-17/+8
| | |_|/ | |/| |
* | | | Merge branch 'cc/split-index-config'Junio C Hamano2017-03-172-25/+17
|\ \ \ \
| * | | | config: add git_config_get_expiry() from gc.cChristian Couder2017-03-011-13/+2
| * | | | update-index: warn in case of split-index incoherencyChristian Couder2017-03-011-1/+10
| * | | | split-index: add {add,remove}_split_index() functionsChristian Couder2017-03-011-12/+6
* | | | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-03-141-4/+15
|\ \ \ \ \
| * | | | | branch: honor --abbrev/--no-abbrev in --list modeJunio C Hamano2017-03-101-4/+15
* | | | | | Merge branch 'jk/push-deadlock-regression-fix'Junio C Hamano2017-03-141-1/+4
|\ \ \ \ \ \
| * | | | | | receive-pack: fix deadlock when we cannot create tmpdirJeff King2017-03-071-1/+4
* | | | | | | Merge branch 'mm/fetch-show-error-message-on-unadvertised-object'Junio C Hamano2017-03-141-6/+1
|\ \ \ \ \ \ \
| * | | | | | | fetch-pack: move code to report unmatched refs to a functionMatt McCutchen2017-03-021-6/+1
* | | | | | | | Merge branch 'jk/interpret-branch-name'Junio C Hamano2017-03-143-3/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: restrict @-expansions when finding branchjk/interpret-branch-nameJeff King2017-03-021-1/+1
| * | | | | | | | branch: restrict @-expansions when deletingJeff King2017-03-021-1/+4
| * | | | | | | | interpret_branch_name: allow callers to restrict expansionsJeff King2017-03-023-3/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'js/realpath-pathdup-fix'Junio C Hamano2017-03-121-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | real_pathdup(): fix callsites that wanted it to die on errorjs/realpath-pathdup-fixJohannes Schindelin2017-03-081-3/+3
* | | | | | | | | Merge branch 'rs/log-email-subject'Junio C Hamano2017-03-102-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pretty: use fmt_output_email_subject()rs/log-email-subjectRené Scharfe2017-03-012-3/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sb/submodule-init-url-selection'Junio C Hamano2017-03-101-5/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | submodule init: warn about falling back to a local pathsb/submodule-init-url-selectionStefan Beller2017-02-281-5/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rl/remote-allow-missing-branch-name-merge'Junio C Hamano2017-02-271-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | remote: ignore failure to remove missing branch.<name>.mergerl/remote-allow-missing-branch-name-mergeRoss Lagerwall2017-02-211-1/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'km/delete-ref-reflog-message'Junio C Hamano2017-02-279-14/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | branch: record creation of renamed branch in HEAD's logkm/delete-ref-reflog-messageKyle Meyer2017-02-201-2/+3
| * | | | | | | | update-ref: pass reflog message to delete_ref()Kyle Meyer2017-02-201-1/+1
| * | | | | | | | delete_ref: accept a reflog message argumentKyle Meyer2017-02-209-12/+12
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'js/git-path-in-subdir'Junio C Hamano2017-02-271-4/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | rev-parse: fix several options when running in a subdirectoryjs/git-path-in-subdirJohannes Schindelin2017-02-171-4/+11
* | | | | | | | | Merge branch 'nd/clean-preserve-errno-in-warning'Junio C Hamano2017-02-271-4/+12
|\ \ \ \ \ \ \ \ \