summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/fast-import-cleanup'Junio C Hamano2017-03-285-16/+28
|\
| * pack.h: define largest possible encoded object sizejk/fast-import-cleanupJeff King2017-03-242-2/+10
| * encode_in_pack_object_header: respect output buffer lengthJeff King2017-03-245-10/+16
| * fast-import: use xsnprintf for formatting headersJeff King2017-03-241-3/+1
| * fast-import: use xsnprintf for writing sha1sJeff King2017-03-241-1/+1
* | Merge branch 'sg/skip-prefix-in-prettify-refname'Junio C Hamano2017-03-281-5/+5
|\ \
| * | refs.c: use skip_prefix() in prettify_refname()sg/skip-prefix-in-prettify-refnameSZEDER Gábor2017-03-231-5/+5
* | | Merge branch 'ab/branch-list-doc'Junio C Hamano2017-03-281-2/+7
|\ \ \
| * | | branch doc: update description for `--list`ab/branch-list-docJunio C Hamano2017-03-241-2/+7
| * | | branch doc: change `git branch <pattern>` to use `<branchname>`Ævar Arnfjörð Bjarmason2017-03-231-1/+1
* | | | Merge branch 'jk/pager-in-use'Junio C Hamano2017-03-281-3/+1
|\ \ \ \
| * | | | pager_in_use: use git_env_bool()jk/pager-in-useJeff King2017-03-241-3/+1
| |/ / /
* | | | Merge branch 'tg/stash-push-fixup'Junio C Hamano2017-03-283-6/+30
|\ \ \ \
| * | | | stash: keep untracked files intact in stash -kThomas Gummerer2017-03-222-1/+17
| * | | | stash: pass the pathspec argument to git resetThomas Gummerer2017-03-222-1/+9
| * | | | stash: don't show internal implementation detailsThomas Gummerer2017-03-222-5/+5
* | | | | Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-03-2817-113/+1084
|\ \ \ \ \
| * | | | | builtin/read-tree: add --recurse-submodules switchStefan Beller2017-03-164-1/+49
| * | | | | builtin/checkout: add --recurse-submodules switchStefan Beller2017-03-164-5/+62
| * | | | | entry.c: create submodules when interestingStefan Beller2017-03-161-0/+30
| * | | | | unpack-trees: check if we can perform the operation for submodulesStefan Beller2017-03-162-9/+123
| * | | | | unpack-trees: pass old oid to verify_clean_submoduleStefan Beller2017-03-161-7/+10
| * | | | | update submodules: add submodule_move_headStefan Beller2017-03-162-0/+144
| * | | | | submodule.c: get_super_prefix_or_emptyStefan Beller2017-03-161-6/+10
| * | | | | update submodules: move up prepare_submodule_repo_envStefan Beller2017-03-151-12/+17
| * | | | | submodules: introduce check to see whether to touch a submoduleStefan Beller2017-03-152-0/+23
| * | | | | update submodules: add a config option to determine if submodules are updatedStefan Beller2017-03-152-0/+7
| * | | | | update submodules: add submodule config parsingStefan Beller2017-03-152-8/+29
| * | | | | make is_submodule_populated gentlyStefan Beller2017-03-153-7/+10
| * | | | | lib-submodule-update.sh: define tests for recursing into submodulesStefan Beller2017-03-151-2/+504
| * | | | | lib-submodule-update.sh: replace sha1 by hashStefan Beller2017-03-151-3/+3
| * | | | | lib-submodule-update: teach test_submodule_content the -C <dir> flagStefan Beller2017-03-151-0/+5
| * | | | | lib-submodule-update.sh: do not use ./. as submodule remoteStefan Beller2017-03-151-2/+13
| * | | | | lib-submodule-update.sh: reorder create_lib_submodule_repoStefan Beller2017-03-151-20/+29
| * | | | | submodule--helper.c: remove duplicate codeValery Tolstov2017-03-151-20/+2
| * | | | | connect_work_tree_and_git_dir: safely create leading directoriesStefan Beller2017-03-152-20/+23
* | | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-03-282-17/+16
|\ \ \ \ \ \
| * | | | | | grep: fix builds with with no thread supportBrandon Williams2017-03-181-12/+9
| * | | | | | grep: set default output methodBrandon Williams2017-03-171-5/+7
* | | | | | | Eighth batch for 2.13Junio C Hamano2017-03-271-0/+22
* | | | | | | Merge branch 'km/config-grammofix'Junio C Hamano2017-03-271-3/+3
|\ \ \ \ \ \ \
| * | | | | | | doc/config: grammar fixes for core.{editor,commentChar}km/config-grammofixKyle Meyer2017-03-231-3/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'sb/t3600-rephrase'Junio C Hamano2017-03-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t3600: rename test to describe its functionalitysb/t3600-rephraseStefan Beller2017-03-221-1/+1
* | | | | | | | Merge branch 'sb/describe-broken'Junio C Hamano2017-03-273-12/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/describe: introduce --broken flagsb/describe-brokenStefan Beller2017-03-223-12/+66
* | | | | | | | | Merge branch 'sb/push-options-via-transport'Junio C Hamano2017-03-275-14/+58
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remote-curl: allow push optionssb/push-options-via-transportBrandon Williams2017-03-224-2/+50
| * | | | | | | | | send-pack: send push options correctly in stateless-rpc caseBrandon Williams2017-03-221-12/+8
* | | | | | | | | | Merge branch 'km/t1400-modernization'Junio C Hamano2017-03-271-76/+78
|\ \ \ \ \ \ \ \ \ \