summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* config: remove git_config_maybe_boolma/remove-config-maybe-boolMartin Ågren2017-09-073-10/+0
* Merge branch 'ma/parse-maybe-bool'Junio C Hamano2017-08-2213-25/+41
|\
| * parse_decoration_style: drop unused argument `var`ma/parse-maybe-boolMartin Ågren2017-08-071-3/+3
| * treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren2017-08-0710-13/+17
| * config: make git_{config,parse}_maybe_bool equivalentMartin Ågren2017-08-072-6/+6
| * config: introduce git_parse_maybe_bool_textMartin Ågren2017-08-071-3/+8
| * t5334: document that git push --signed=1 does not workMartin Ågren2017-08-071-0/+7
| * Doc/git-{push,send-pack}: correct --sign= to --signed=Martin Ågren2017-08-072-4/+4
* | Merge branch 'ab/ref-filter-no-contains'Junio C Hamano2017-08-221-1/+1
|\ \
| * | tests: don't give unportable ">" to "test" built-in, use -gtab/ref-filter-no-containsÆvar Arnfjörð Bjarmason2017-08-071-1/+1
* | | Merge branch 'bw/clone-recursive-quiet'Junio C Hamano2017-08-222-0/+9
|\ \ \
| * | | clone: teach recursive clones to respect -qbw/clone-recursive-quietBrandon Williams2017-08-042-0/+9
* | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-08-2220-449/+246
|\ \ \ \
| * | | | grep: recurse in-process using 'struct repository'Brandon Williams2017-08-027-344/+88
| * | | | submodule: merge repo_read_gitmodules and gitmodules_configBrandon Williams2017-08-021-20/+17
| * | | | submodule: check for unmerged .gitmodules outside of config parsingBrandon Williams2017-08-022-24/+24
| * | | | submodule: check for unstaged .gitmodules outside of config parsingBrandon Williams2017-08-024-18/+20
| * | | | submodule: remove fetch.recursesubmodules from submodule-config parsingBrandon Williams2017-08-023-15/+14
| * | | | submodule: remove submodule.fetchjobs from submodule-config parsingBrandon Williams2017-08-026-21/+40
| * | | | config: add config_from_gitmodulesBrandon Williams2017-08-022-0/+27
| * | | | cache.h: add GITMODULES_FILE macroBrandon Williams2017-08-023-11/+12
| * | | | repository: have the_repository use the_indexBrandon Williams2017-07-181-1/+3
| * | | | repo_read_index: don't discard the indexBrandon Williams2017-07-182-2/+8
* | | | | Merge branch 'pw/sequence-rerere-autoupdate'Junio C Hamano2017-08-227-50/+171
|\ \ \ \ \
| * | | | | cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdatePhillip Wood2017-08-022-0/+15
| * | | | | cherry-pick/revert: remember --rerere-autoupdatePhillip Wood2017-08-022-8/+62
| * | | | | t3504: use test_commitPhillip Wood2017-08-021-12/+9
| * | | | | rebase -i: honor --rerere-autoupdatePhillip Wood2017-08-023-3/+17
| * | | | | rebase: honor --rerere-autoupdatePhillip Wood2017-08-022-28/+57
| * | | | | am: remember --rerere-autoupdate settingPhillip Wood2017-08-021-0/+12
* | | | | | Merge branch 'bw/push-options-recursively-to-submodules'Junio C Hamano2017-08-223-13/+79
|\ \ \ \ \ \
| * | | | | | submodule--helper: teach push-check to handle HEADbw/push-options-recursively-to-submodulesBrandon Williams2017-07-203-13/+79
* | | | | | | The first batch of topics after the 2.14 cycleJunio C Hamano2017-08-112-1/+134
* | | | | | | Merge branch 'ma/pager-per-subcommand-action'Junio C Hamano2017-08-116-76/+201
|\ \ \ \ \ \ \
| * | | | | | | git.c: ignore pager.* when launching builtin as dashed externalma/pager-per-subcommand-actionMartin Ågren2017-08-032-2/+2
| * | | | | | | tag: change default of `pager.tag` to "on"Martin Ågren2017-08-033-16/+16
| * | | | | | | tag: respect `pager.tag` in list-mode onlyMartin Ågren2017-08-034-2/+21
| * | | | | | | t7006: add tests for how git tag paginatesMartin Ågren2017-08-031-0/+67
| * | | | | | | git.c: provide setup_auto_pager()Martin Ågren2017-08-032-0/+22
| * | | | | | | git.c: let builtins opt for handling `pager.foo` themselvesMartin Ågren2017-08-032-1/+11
| * | | | | | | builtin.h: take over documentation from api-builtin.txtMartin Ågren2017-08-032-73/+80
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/rev-list-empty-input'Junio C Hamano2017-08-115-13/+26
|\ \ \ \ \ \ \
| * | | | | | | revision: do not fallback to default when rev_input_given is setjk/rev-list-empty-inputJeff King2017-08-022-1/+7
| * | | | | | | rev-list: don't show usage when we see empty ref patternsJeff King2017-08-022-4/+5
| * | | | | | | revision: add rev_input_given flagJeff King2017-08-022-0/+8
| * | | | | | | t6018: flesh out empty input/output rev-list testsJeff King2017-08-021-11/+9
| |/ / / / / /
* | | | | | | Merge branch 'jt/t1450-fsck-corrupt-packfile'Junio C Hamano2017-08-111-0/+16
|\ \ \ \ \ \ \
| * | | | | | | tests: ensure fsck fails on corrupt packfilesjt/t1450-fsck-corrupt-packfileJonathan Tan2017-07-281-0/+16
* | | | | | | | Merge branch 'js/git-gui-msgfmt-on-windows'Junio C Hamano2017-08-112-7/+12
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-w...js/git-gui-msgfmt-on-windowsJunio C Hamano2017-07-252-7/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
View Lorry Controller Status