summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-06-251-1/+0
|\
| * Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-aJunio C Hamano2015-06-231-1/+0
* | Merge branch 'jk/index-pack-reduce-recheck'Junio C Hamano2015-06-241-1/+1
|\ \
| * | index-pack: avoid excessive re-reading of pack directoryjk/index-pack-reduce-recheckJeff King2015-06-091-1/+1
* | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref'Junio C Hamano2015-06-241-0/+5
|\ \ \
| * | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-021-0/+5
* | | | Merge branch 'mh/fsck-reflog-entries'Junio C Hamano2015-06-241-14/+20
|\ \ \ \
| * | | | fsck: report errors if reflog entries point at invalid objectsmh/fsck-reflog-entriesMichael Haggerty2015-06-081-4/+9
| * | | | fsck_handle_reflog_sha1(): new functionMichael Haggerty2015-06-081-14/+15
* | | | | Merge branch 'qn/blame-show-email'Junio C Hamano2015-06-241-1/+9
|\ \ \ \ \
| * | | | | blame: add blame.showEmail configurationqn/blame-show-emailQuentin Neill2015-06-011-1/+9
| |/ / / /
* | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'Junio C Hamano2015-06-241-6/+6
|\ \ \ \ \
| * | | | | format-patch: do not feed tags to clear_commit_marks()jc/do-not-feed-tags-to-clear-commit-marksJunio C Hamano2015-06-011-6/+6
* | | | | | Merge branch 'jc/apply-reject-noop-hunk'Junio C Hamano2015-06-241-0/+3
|\ \ \ \ \ \
| * | | | | | apply: reject a hunk that does not do anythingjc/apply-reject-noop-hunkJunio C Hamano2015-06-011-0/+3
| |/ / / / /
* | | | | | Merge branch 'nd/slim-index-pack-memory-usage'Junio C Hamano2015-06-161-2/+6
|\ \ \ \ \ \
| * | | | | | index-pack: fix truncation of off_t in comparisonnd/slim-index-pack-memory-usageJeff King2015-06-041-2/+6
* | | | | | | Merge branch 'jk/clone-dissociate'Junio C Hamano2015-06-111-13/+4
|\ \ \ \ \ \ \
| * | | | | | | clone: reorder --dissociate and --reference optionsjk/clone-dissociateJeff King2015-05-271-2/+2
| * | | | | | | clone: use OPT_STRING_LIST for --referenceJeff King2015-05-271-11/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'bc/object-id'Junio C Hamano2015-06-0516-122/+136
|\ \ \ \ \ \ \
| * | | | | | | builtin/show-ref: rewrite to take an object_id argumentMichael Haggerty2015-05-251-11/+9
| * | | | | | | show_ref(): convert local variable peeled to object_idMichael Haggerty2015-05-251-3/+3
| * | | | | | | builtin/show-ref: rewrite to use object_idMichael Haggerty2015-05-251-18/+15
| * | | | | | | fsck: change functions to use object_idMichael Haggerty2015-05-251-16/+13
| * | | | | | | cmd_show_branch(): fix error messageMichael Haggerty2015-05-251-1/+1
| * | | | | | | builtin/show-branch: rewrite functions to work with object_idMichael Haggerty2015-05-251-21/+21
| * | | | | | | append_one_rev(): rewrite to work with object_idMichael Haggerty2015-05-251-3/+3
| * | | | | | | builtin/show-branch: rewrite functions to take object_id argumentsMichael Haggerty2015-05-251-18/+17
| * | | | | | | append_matching_ref(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-7/+6
| * | | | | | | show_reference(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-10/+8
| * | | | | | | builtin/remote: rewrite functions to take object_id argumentsMichael Haggerty2015-05-251-13/+8
| * | | | | | | add_branch_for_removal(): don't set "util" field of string_list entriesMichael Haggerty2015-05-251-5/+2
| * | | | | | | add_branch_for_removal(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-5/+3
| * | | | | | | builtin/reflog: rewrite ref functions to take an object_id argumentMichael Haggerty2015-05-251-10/+6
| * | | | | | | show_ref_cb(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-5/+3
| * | | | | | | builtin/pack-objects: rewrite to take an object_id argumentMichael Haggerty2015-05-251-16/+10
| * | | | | | | name_ref(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-6/+4
| * | | | | | | grab_single_ref(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-5/+4
| * | | | | | | builtin/fetch: rewrite to take an object_id argumentMichael Haggerty2015-05-251-12/+11
| * | | | | | | get_name(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-9/+7
| * | | | | | | add_pending_uninteresting_ref(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-5/+3
| * | | | | | | append_ref(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-5/+3
| * | | | | | | builtin/rev-parse: rewrite to take an object_id argumentMichael Haggerty2015-05-251-24/+17
| * | | | | | | each_ref_fn: change to take an object_id parameterMichael Haggerty2015-05-2516-39/+104
* | | | | | | | Merge branch 'jk/at-push-sha1'Junio C Hamano2015-06-054-31/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | for-each-ref: accept "%(push)" formatjk/at-push-sha1Jeff King2015-05-221-2/+15
| * | | | | | | | for-each-ref: use skip_prefix instead of starts_withJeff King2015-05-221-2/+4
| * | | | | | | | remote.c: return upstream name from stat_tracking_infoJeff King2015-05-222-13/+7
| * | | | | | | | remote.c: report specific errors from branch_get_upstreamJeff King2015-05-213-3/+3
View Lorry Controller Status