summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* sequencer: pass absolute GIT_DIR to exec commandsjk/rebase-i-exec-gitdir-fixJacob Keller2017-11-022-1/+17
* 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() functionbw/attrBrandon 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
| * | attr.c: outline the future plans by heavily commentingJunio C Hamano2017-02-011-1/+39
| * | Documentation: fix a typoStefan Beller2017-02-011-1/+1
| * | attr.c: add push_stack() helperJunio C Hamano2017-02-011-38/+33
| * | attr: support quoting pathname patterns in C styleNguyễn Thái Ngọc Duy2017-02-013-5/+44
| * | attr.c: plug small leak in parse_attr_line()Junio C Hamano2017-02-011-4/+8
| * | attr.c: tighten constness around "git_attr" structureJunio C Hamano2017-02-012-3/+3
| * | attr.c: simplify macroexpand_one()Junio C Hamano2017-02-011-7/+4
| * | attr.c: mark where #if DEBUG ends more clearlyJunio C Hamano2017-02-011-1/+1
| * | attr.c: complete a sentence in a commentJunio C Hamano2017-02-011-1/+1
| * | attr.c: explain the lack of attr-name syntax check in parse_attr()Junio C Hamano2017-02-011-0/+6
| * | attr.c: update a stale comment on "struct match_attr"Junio C Hamano2017-02-011-3/+2
| * | attr.c: use strchrnul() to scan for one lineJunio C Hamano2017-02-011-2/+2
| * | commit.c: use strchrnul() to scan for one lineJunio C Hamano2017-02-011-2/+1
* | | Merge branch 'sg/completion'Junio C Hamano2017-02-275-168/+690
|\ \ \
| * | | completion: restore removed line continuating backslashsg/completionSZEDER Gábor2017-02-131-1/+1
| * | | completion: cache the path to the repositorySZEDER Gábor2017-02-032-75/+132
| * | | completion: extract repository discovery from __gitdir()SZEDER Gábor2017-02-032-22/+42
| * | | completion: don't guard git executions with __gitdir()SZEDER Gábor2017-02-031-21/+11
| * | | completion: consolidate silencing errors from git commandsSZEDER Gábor2017-02-031-16/+12
| * | | completion: don't use __gitdir() for git commandsSZEDER Gábor2017-02-031-29/+31
| * | | completion: respect 'git -C <path>'SZEDER Gábor2017-02-032-5/+101
| * | | rev-parse: add '--absolute-git-dir' optionSZEDER Gábor2017-02-033-16/+31
| * | | completion: fix completion after 'git -C <path>'SZEDER Gábor2017-02-032-5/+10
| * | | completion: don't offer commands when 'git --opt' needs an argumentSZEDER Gábor2017-02-031-0/+11
| * | | completion: list short refs from a remote given as a URLSZEDER Gábor2017-02-032-6/+19
| * | | completion: don't list 'HEAD' when trying refs completion outside of a repoSZEDER Gábor2017-02-032-3/+7
| * | | completion: list refs from remote when remote's name matches a directorySZEDER Gábor2017-02-032-3/+28
| * | | completion: respect 'git --git-dir=<path>' when listing remote refsSZEDER Gábor2017-02-032-7/+19
| * | | completion: fix most spots not respecting 'git --git-dir=<path>'SZEDER Gábor2017-02-031-5/+7
| * | | completion: ensure that the repository path given on the command line existsSZEDER Gábor2017-02-032-0/+9
| * | | completion tests: add tests for the __git_refs() helper functionSZEDER Gábor2017-02-031-1/+264