summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \