summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | show-branch: drop head_len variableJeff King2017-02-141-6/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'jn/remote-helpers-with-git-dir'Junio C Hamano2017-02-274-3/+22
|\ \ \ \ \ \ \
| * | | | | | | remote helpers: avoid blind fall-back to ".git" when setting GIT_DIRJonathan Nieder2017-02-142-2/+12
| * | | | | | | remote: avoid reading $GIT_DIR config in non-repoJeff King2017-02-142-1/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/grep-no-index-fix'Junio C Hamano2017-02-272-27/+121
|\ \ \ \ \ \ \
| * | | | | | | grep: treat revs the same for --untracked as for --no-indexJeff King2017-02-142-6/+6
| * | | | | | | grep: do not diagnose misspelt revs with --no-indexJeff King2017-02-142-1/+6
| * | | | | | | grep: avoid resolving revision names in --no-index caseJeff King2017-02-142-0/+19
| * | | | | | | grep: fix "--" rev/pathspec disambiguationJeff King2017-02-142-5/+57
| * | | | | | | grep: re-order rev-parsing loopJeff King2017-02-141-9/+11
| * | | | | | | grep: do not unnecessarily query repo for "--"Jonathan Tan2017-02-142-4/+20
| * | | | | | | grep: move thread initialization a little lowerJeff King2017-02-141-14/+14
* | | | | | | | Merge branch 'dt/gc-ignore-old-gc-logs'Junio C Hamano2017-02-273-7/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | gc: ignore old gc.log filesDavid Turner2017-02-143-7/+71
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jh/preload-index-skip-skip'Junio C Hamano2017-02-271-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | preload-index: avoid lstat for skip-worktree itemsJeff Hostetler2017-02-101-0/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'mh/submodule-hash'Junio C Hamano2017-02-273-112/+134
|\ \ \ \ \ \ \ \
| * | | | | | | | read_loose_refs(): read refs using resolve_ref_recursively()Michael Haggerty2017-02-143-18/+13
| * | | | | | | | files_ref_store::submodule: use NULL for the main repositoryMichael Haggerty2017-02-101-8/+8
| * | | | | | | | base_ref_store_init(): remove submodule argumentMichael Haggerty2017-02-103-7/+5
| * | | | | | | | refs: push the submodule attribute downMichael Haggerty2017-02-103-42/+43
| * | | | | | | | refs: store submodule ref stores in a hashmapMichael Haggerty2017-02-102-19/+45
| * | | | | | | | register_ref_store(): new functionMichael Haggerty2017-02-101-14/+29
| * | | | | | | | refs: remove some unnecessary handling of submodule == ""Michael Haggerty2017-02-101-11/+2
| * | | | | | | | refs: make some ref_store lookup functions privateMichael Haggerty2017-02-102-21/+17
| * | | | | | | | refs: reorder some function definitionsMichael Haggerty2017-02-101-32/+32
| |/ / / / / / /
* | | | | | | | Merge branch 'sf/putty-w-args'Junio C Hamano2017-02-274-19/+133
|\ \ \ \ \ \ \ \
| * | | | | | | | connect.c: stop conflating ssh command names and overridesJunio C Hamano2017-02-101-13/+32
| * | | | | | | | connect: Add the envvar GIT_SSH_VARIANT and ssh.variant configSegev Finer2017-02-014-3/+51
| * | | | | | | | git_connect(): factor out SSH variant handlingJohannes Schindelin2017-02-011-26/+46
| * | | | | | | | connect: rename tortoiseplink and putty variablesJunio C Hamano2017-01-261-10/+13
| * | | | | | | | connect: handle putty/plink also in GIT_SSH_COMMANDSegev Finer2017-01-252-7/+31
* | | | | | | | | Merge branch 'js/rebase-helper'Junio C Hamano2017-02-277-1/+58
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase -i: use the rebase--helper builtinJohannes Schindelin2017-02-092-1/+14
| * | | | | | | | | rebase--helper: add a builtin helper for interactive rebasesJohannes Schindelin2017-02-095-0/+44
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bw/attr'Junio C Hamano2017-02-2714-444/+816
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | attr: reformat git_attr_set_direction() functionBrandon Williams2017-02-012-30/+22
| * | | | | | | | | attr: push the bare repo check into read_attr()Brandon Williams2017-02-011-60/+54
| * | | | | | | | | attr: store attribute stack in attr_check structureBrandon Williams2017-02-012-89/+199
| * | | | | | | | | attr: tighten const correctness with git_attr and match_attrBrandon Williams2017-02-013-8/+9
| * | | | | | | | | attr: remove maybe-real, maybe-macro from git_attrBrandon Williams2017-02-011-38/+37
| * | | | | | | | | attr: eliminate global check_all_attr arrayBrandon Williams2017-02-012-39/+87
| * | | | | | | | | attr: use hashmap for attribute dictionaryBrandon Williams2017-02-013-45/+133
| * | | | | | | | | attr: change validity check for attribute names to use positive logicJunio C Hamano2017-02-011-14/+20
| * | | | | | | | | attr: pass struct attr_check to collect_some_attrsBrandon Williams2017-02-011-20/+13
| * | | | | | | | | attr: retire git_check_attrs() APIJunio C Hamano2017-02-013-32/+58
| * | | | | | | | | attr: convert git_check_attrs() callers to use the new APIJunio C Hamano2017-02-016-86/+45
| * | | | | | | | | attr: convert git_all_attrs() to use "struct attr_check"Junio C Hamano2017-02-013-56/+43
| * | | | | | | | | attr: (re)introduce git_check_attr() and struct attr_checkJunio C Hamano2017-02-012-0/+91
| * | | | | | | | | attr: rename function and struct related to checking attributesJunio C Hamano2017-02-019-41/+42