summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tb/add-renormalize'Junio C Hamano2017-11-271-2/+26
|\
| * add: introduce "--renormalize"tb/add-renormalizeTorsten Bögershausen2017-11-171-2/+26
* | Merge branch 'tz/notes-error-to-stderr'Junio C Hamano2017-11-271-4/+4
|\ \
| * | notes: send "Automatic notes merge failed" messages to stderrtz/notes-error-to-stderrTodd Zullinger2017-11-151-4/+4
* | | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-212-3/+43
|\ \ \
| * | | update-index: add fsmonitor support to update-indexBen Peart2017-10-011-1/+32
| * | | ls-files: Add support in ls-files to display the fsmonitor valid bitBen Peart2017-10-011-2/+6
| * | | fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart2017-10-011-0/+2
| * | | update-index: add a new --force-write-index optionBen Peart2017-09-241-1/+4
* | | | Merge branch 'bp/read-index-from-skip-verification'Junio C Hamano2017-11-151-0/+1
|\ \ \ \
| * | | | read_index_from(): speed index loading by skipping verification of the entry ...bp/read-index-from-skip-verificationBen Peart2017-11-081-0/+1
| * | | | Merge branch 'jk/write-in-full-fix' into maintJunio C Hamano2017-10-234-5/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'rj/no-sign-compare' into maintJunio C Hamano2017-10-231-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ma/ts-cleanups' into maintJunio C Hamano2017-10-231-0/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jt/fast-export-copy-modify-fix' into maintJunio C Hamano2017-10-231-14/+32
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'rd/bisect-view-is-visualize'Junio C Hamano2017-11-151-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bisect: mention "view" as an alternative to "visualize"rd/bisect-view-is-visualizeRobert P. J. Day2017-11-131-1/+1
* | | | | | | | | | Merge branch 'ma/reduce-heads-leakfix'Junio C Hamano2017-11-155-22/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reduce_heads: fix memory leaksma/reduce-heads-leakfixMartin Ågren2017-11-085-5/+11
| * | | | | | | | | | builtin/merge-base: free commit listsMartin Ågren2017-11-081-18/+18
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mh/tidy-ref-update-flags'Junio C Hamano2017-11-158-12/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty2017-11-068-12/+12
| * | | | | | | | | | Merge branch 'bc/object-id' into baseMichael Haggerty2017-10-2830-179/+179
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ma/bisect-leakfix'Junio C Hamano2017-11-151-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bisect: change calling-convention of `find_bisection()`Martin Ågren2017-11-061-2/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jm/status-ignored-files-list'Junio C Hamano2017-11-131-6/+25
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | status: add option to show ignored files differentlyJameson Miller2017-10-311-6/+25
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-0910-37/+37
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-019-34/+34
| * | | | | | | | | | diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-011-1/+1
| * | | | | | | | | | diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-017-20/+20
| * | | | | | | | | | diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-015-11/+11
| * | | | | | | | | | diff: remove touched flagsBrandon Williams2017-11-011-2/+0
| * | | | | | | | | | diff: add flag to indicate textconv was set via cmdlineBrandon Williams2017-11-011-1/+1
| * | | | | | | | | | diff: convert flags to be stored in bitfieldsBrandon Williams2017-11-012-4/+6
| * | | | | | | | | | add, reset: use DIFF_OPT_SET macro to set a diff flagBrandon Williams2017-10-312-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mp/push-pushoption-config'Junio C Hamano2017-11-061-5/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/push.c: add push.pushOption configmp/push-pushoption-configMarius Paliga2017-10-241-5/+21
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jc/check-ref-format-oor'Junio C Hamano2017-11-061-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | check-ref-format --branch: strip refs/heads/ using skip_prefixJunio C Hamano2017-10-181-2/+4
* | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2017-11-0630-179/+179
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | refs: convert resolve_ref_unsafe to struct object_idbrian m. carlson2017-10-161-1/+1
| * | | | | | | | | | worktree: convert struct worktree to object_idbrian m. carlson2017-10-161-3/+3
| * | | | | | | | | | refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson2017-10-161-2/+2
| * | | | | | | | | | refs: convert reflog_expire parameter to struct object_idbrian m. carlson2017-10-161-3/+3
| * | | | | | | | | | refs: convert read_ref_at to struct object_idbrian m. carlson2017-10-161-2/+2
| * | | | | | | | | | refs: convert peel_ref to struct object_idbrian m. carlson2017-10-163-4/+4
| * | | | | | | | | | builtin/pack-objects: convert to struct object_idbrian m. carlson2017-10-161-67/+68
| * | | | | | | | | | pack-bitmap: convert traverse_bitmap_commit_list to object_idbrian m. carlson2017-10-162-6/+6
| * | | | | | | | | | refs: convert dwim_log to struct object_idbrian m. carlson2017-10-161-2/+2
View Lorry Controller Status