summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | tag: add the option to force signing of annotated tagsla/tag-force-signing-annotated-tagsLaurent Arnoud2016-03-221-6/+14
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/submodule-c-credential'Junio C Hamano2016-04-061-3/+73
|\ \ \ \ \ \ \ \
| * | | | | | | | git: submodule honor -c credential.* from command lineJacob Keller2016-03-011-1/+67
| * | | | | | | | submodule: fix segmentation fault in submodule--helper cloneJacob Keller2016-03-011-3/+3
| * | | | | | | | submodule: fix submodule--helper clone usageJacob Keller2016-03-011-1/+1
| * | | | | | | | submodule: check argc count for git submodule--helper cloneJacob Keller2016-03-011-0/+4
* | | | | | | | | Merge branch 'jv/merge-nothing-into-void'Junio C Hamano2016-04-061-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-voidJunio C Hamano2016-03-231-5/+5
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7jk/path-name-safety-2.7Junio C Hamano2016-03-162-21/+6
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6jk/path-name-safety-2.6Junio C Hamano2016-03-162-21/+6
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5jk/path-name-safety-2.5Junio C Hamano2016-03-162-21/+6
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | | * | | | | | list-objects: pass full pathname to callbacksjk/path-name-safety-2.4Jeff King2016-03-162-21/+6
| | | | * | | | | | list-objects: drop name_path entirelyJeff King2016-03-162-4/+4
| * | | | | | | | | Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2016-03-101-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/config-set-in-non-repository' into maintJunio C Hamano2016-03-101-0/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-module-list-fix' into maintJunio C Hamano2016-03-101-8/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-03-1021-101/+63
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/am-i-v-fix' into maintJunio C Hamano2016-03-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/git-common-dir-fix' into maintJunio C Hamano2016-03-101-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2016-03-101-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/config-error' into maintJunio C Hamano2016-03-105-65/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/commit-squash-msg'Junio C Hamano2016-04-061-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | commit: do not lose SQUASH_MSG contentsss/commit-squash-msgSven Strickroth2016-03-211-1/+10
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-update'Junio C Hamano2016-04-063-9/+268
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | clone: allow an explicit argument for parallel submodule clonesStefan Beller2016-03-011-6/+13
| * | | | | | | | | | | | | | | | | | | submodule update: expose parallelism to the userStefan Beller2016-03-011-1/+7
| * | | | | | | | | | | | | | | | | | | submodule helper: remove double 'fatal: ' prefixStefan Beller2016-03-011-2/+2
| * | | | | | | | | | | | | | | | | | | git submodule update: have a dedicated helper for cloningStefan Beller2016-03-011-0/+246
| * | | | | | | | | | | | | | | | | | | fetching submodules: respect `submodule.fetchJobs` config optionStefan Beller2016-03-011-1/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'ss/receive-pack-parse-options'Junio C Hamano2016-04-061-33/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | builtin/receive-pack.c: use parse_options APIss/receive-pack-parse-optionsSidhant Sharma [:tk]2016-03-011-33/+20
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/startup-info'Junio C Hamano2016-04-032-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | grep: turn off gitlink detection for --no-indexJeff King2016-03-071-2/+4
| * | | | | | | | | | | | | | | | | | | | | setup: set startup_info->have_repository more reliablyJeff King2016-03-061-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/index-pack'Junio C Hamano2016-04-031-18/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | index-pack: add a helper function to derive .idx/.keep filenamejc/index-packJunio C Hamano2016-03-031-18/+17
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-index-pack-keep' into jc/index-packJunio C Hamano2016-03-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch'Junio C Hamano2016-04-031-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | fetch-pack: fix object_id of exact sha1Gabriel Souza Franco2016-03-011-3/+13
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-index-pack-keep'Junio C Hamano2016-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | index-pack: correct --keep[=<msg>]jc/maint-index-pack-keepJunio C Hamano2016-03-031-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-local-env-vars'Junio C Hamano2016-04-031-18/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | rev-parse: let some options run outside repositoryjk/rev-parse-local-env-varsJeff King2016-02-291-18/+32
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-get-urlmatch'Junio C Hamano2016-04-031-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | config: fail if --get-urlmatch finds no valueJohn Keeping2016-02-281-1/+4
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/diff-renames-default'Junio C Hamano2016-04-034-5/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | diff: activate diff.renames by defaultmm/diff-renames-defaultMatthieu Moy2016-02-254-0/+4
| * | | | | | | | | | | | | | | | | | | | | log: introduce init_log_defaults()Matthieu Moy2016-02-251-5/+10
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-module-list-pathspec-fix'Junio C Hamano2016-03-241-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | submodule: fix regression for deinit without submodulesStefan Beller2016-03-221-3/+3
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |