summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | clean: use warning_errno() when appropriatend/clean-preserve-errno-in-warningNguyễn Thái Ngọc Duy2017-02-161-4/+12
| | |_|/ | |/| |
* | | | Merge branch 'jk/show-branch-lift-name-len-limit'Junio C Hamano2017-02-271-29/+13
|\ \ \ \
| * | | | show-branch: use skip_prefix to drop magic numbersjk/show-branch-lift-name-len-limitJeff King2017-02-151-11/+8
| * | | | show-branch: store resolved head in heap bufferJeff King2017-02-141-14/+5
| * | | | show-branch: drop head_len variableJeff King2017-02-141-6/+2
* | | | | Merge branch 'jk/grep-no-index-fix'Junio C Hamano2017-02-271-27/+55
|\ \ \ \ \
| * | | | | grep: treat revs the same for --untracked as for --no-indexjk/grep-no-index-fixJeff King2017-02-141-5/+5
| * | | | | grep: do not diagnose misspelt revs with --no-indexJeff King2017-02-141-1/+1
| * | | | | grep: avoid resolving revision names in --no-index caseJeff King2017-02-141-0/+6
| * | | | | grep: fix "--" rev/pathspec disambiguationJeff King2017-02-141-5/+24
| * | | | | grep: re-order rev-parsing loopJeff King2017-02-141-9/+11
| * | | | | grep: do not unnecessarily query repo for "--"Jonathan Tan2017-02-141-4/+5
| * | | | | grep: move thread initialization a little lowerJeff King2017-02-141-14/+14
* | | | | | Merge branch 'dt/gc-ignore-old-gc-logs'Junio C Hamano2017-02-271-7/+50
|\ \ \ \ \ \
| * | | | | | gc: ignore old gc.log filesDavid Turner2017-02-131-7/+50
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'js/rebase-helper'Junio C Hamano2017-02-271-0/+40
|\ \ \ \ \ \
| * | | | | | rebase--helper: add a builtin helper for interactive rebasesJohannes Schindelin2017-02-091-0/+40
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'bw/attr'Junio C Hamano2017-02-272-46/+39
|\ \ \ \ \ \
| * | | | | | attr: tighten const correctness with git_attr and match_attrBrandon Williams2017-02-011-1/+2
| * | | | | | attr: convert git_check_attrs() callers to use the new APIJunio C Hamano2017-02-011-14/+5
| * | | | | | attr: convert git_all_attrs() to use "struct attr_check"Junio C Hamano2017-02-011-30/+30
| * | | | | | attr: rename function and struct related to checking attributesJunio C Hamano2017-02-012-12/+13
* | | | | | | Merge branch 'sg/completion'Junio C Hamano2017-02-271-8/+18
|\ \ \ \ \ \ \
| * | | | | | | rev-parse: add '--absolute-git-dir' optionSZEDER Gábor2017-02-031-8/+18
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'cw/tag-reflog-message'Junio C Hamano2017-02-271-1/+53
|\ \ \ \ \ \ \
| * | | | | | | tag: generate useful reflog messagecw/tag-reflog-messageCornelius Weig2017-02-081-1/+53
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/alternate-ref-optim'Junio C Hamano2017-02-271-19/+22
|\ \ \ \ \ \ \
| * | | | | | | receive-pack: avoid duplicates between our refs and alternatesJeff King2017-02-081-1/+3
| * | | | | | | receive-pack: treat namespace .have lines like alternatesJeff King2017-02-081-3/+7
| * | | | | | | receive-pack: fix misleading namespace/.have commentJeff King2017-02-081-4/+1
| * | | | | | | receive-pack: use oidset to de-duplicate .have linesJeff King2017-02-081-14/+12
| * | | | | | | for_each_alternate_ref: pass name/oid instead of ref structJeff King2017-02-081-2/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-02-272-198/+96
|\ \ \ \ \ \ \
| * | | | | | | branch: implement '--format' optionKarthik Nayak2017-01-311-5/+9
| * | | | | | | branch: use ref-filter printing APIsKarthik Nayak2017-01-311-162/+85
| * | | | | | | branch, tag: use porcelain outputKarthik Nayak2017-01-312-0/+4
| * | | | | | | ref-filter: rename the 'strip' option to 'lstrip'Karthik Nayak2017-01-101-2/+2
| * | | | | | | ref-filter: move get_head_description() from branch.cKarthik Nayak2017-01-101-33/+0
* | | | | | | | Merge branch 'jk/delta-chain-limit'Junio C Hamano2017-02-271-23/+110
|\ \ \ \ \ \ \ \
| * | | | | | | | pack-objects: convert recursion to iteration in break_delta_chain()jk/delta-chain-limitJeff King2017-01-271-30/+99
| * | | | | | | | pack-objects: enforce --depth limit in reused deltasJeff King2017-01-271-0/+18