summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* path: implement common_dir handling in git_pathdup_submodule()mk/submodule-gitdir-pathMax Kirillov2015-09-144-9/+41
* submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()Max Kirillov2015-09-141-8/+1
* Git 2.6-rc0v2.6.0-rc0Junio C Hamano2015-09-022-4/+13
* Merge branch 'cc/trailers-corner-case-fix'Junio C Hamano2015-09-022-4/+25
|\
| * trailer: support multiline titlecc/trailers-corner-case-fixChristian Couder2015-08-312-4/+25
* | Merge branch 'sb/read-cache-one-indent-style-fix'Junio C Hamano2015-09-021-1/+1
|\ \
| * | read-cache: fix indentation in read_index_fromsb/read-cache-one-indent-style-fixStefan Beller2015-08-311-1/+1
* | | Merge branch 'ee/clean-test-fixes'Junio C Hamano2015-09-021-12/+4
|\ \ \
| * | | t7300: fix broken && chainsee/clean-test-fixesErik Elfström2015-08-311-12/+4
* | | | Merge branch 'jk/log-missing-default-HEAD'Junio C Hamano2015-09-022-1/+30
|\ \ \ \
| * | | | log: diagnose empty HEAD more clearlyjk/log-missing-default-HEADJeff King2015-08-312-1/+30
* | | | | Ninth batch for 2.6Junio C Hamano2015-09-011-0/+22
* | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-013-5/+15
|\ \ \ \ \
| * | | | | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-updateDavid Turner2015-08-313-5/+15
* | | | | | Merge branch 'rt/remove-hold-lockfile-for-append'Junio C Hamano2015-09-012-57/+7
|\ \ \ \ \ \
| * | | | | | lockfile: remove function "hold_lock_file_for_append"rt/remove-hold-lockfile-for-appendRalf Thielow2015-08-282-57/+7
* | | | | | | Merge branch 'rs/archive-zip-many'Junio C Hamano2015-09-012-5/+134
|\ \ \ \ \ \ \
| * | | | | | | archive-zip: support more than 65535 entriesrs/archive-zip-manyRené Scharfe2015-08-282-4/+91
| * | | | | | | archive-zip: use a local variable to store the creator versionRené Scharfe2015-08-281-2/+4
| * | | | | | | t5004: test ZIP archives with many entriesRené Scharfe2015-08-281-0/+40
* | | | | | | | Merge branch 'ls/p4-fold-case-client-specs'Junio C Hamano2015-09-012-0/+207
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: honor core.ignorecase when using P4 client specsls/p4-fold-case-client-specsLars Schneider2015-08-282-0/+207
* | | | | | | | | Merge branch 'ah/submodule-typofix-in-error'Junio C Hamano2015-09-011-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-submodule: remove extraneous space from error messageah/submodule-typofix-in-errorAlex Henrie2015-08-281-1/+1
* | | | | | | | | | Merge branch 'ah/reflog-typofix-in-error'Junio C Hamano2015-09-011-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reflog: add missing single quote to error messageah/reflog-typofix-in-errorAlex Henrie2015-08-281-1/+1
* | | | | | | | | | | Merge branch 'ah/read-tree-usage-string'Junio C Hamano2015-09-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | read-tree: replace bracket set with parentheses to clarify usageah/read-tree-usage-stringAlex Henrie2015-08-281-1/+1
* | | | | | | | | | | | Merge branch 'ah/pack-objects-usage-strings'Junio C Hamano2015-09-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-objects: place angle brackets around placeholders in usage stringsah/pack-objects-usage-stringsAlex Henrie2015-08-281-2/+2
* | | | | | | | | | | | | Merge branch 'br/svn-doc-include-paths-config'Junio C Hamano2015-09-011-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-svn doc: mention "svn-remote.<name>.include-paths"br/svn-doc-include-paths-configBrett Randall2015-08-261-0/+3
* | | | | | | | | | | | | | Merge branch 'nd/fixup-linked-gitdir'Junio C Hamano2015-09-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | setup: update the right file in multiple checkoutsnd/fixup-linked-gitdirNguyễn Thái Ngọc Duy2015-08-251-2/+2
* | | | | | | | | | | | | | | Eighth batch for 2.6Junio C Hamano2015-08-311-0/+39
* | | | | | | | | | | | | | | Merge branch 'sg/describe-contains'Junio C Hamano2015-08-313-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | describe --contains: default to HEAD when no commit-ish is givensg/describe-containsSZEDER Gábor2015-08-253-6/+14
* | | | | | | | | | | | | | | | Merge branch 'db/push-sign-if-asked'Junio C Hamano2015-08-3114-152/+253
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | push: add a config option push.gpgSign for default signed pushesdb/push-sign-if-askedDave Borowitz2015-08-193-15/+70
| * | | | | | | | | | | | | | | | push: support signing pushes iff the server supports itDave Borowitz2015-08-1910-49/+128
| * | | | | | | | | | | | | | | | builtin/send-pack.c: use parse_options APIDave Borowitz2015-08-191-104/+59
| * | | | | | | | | | | | | | | | config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_...Dave Borowitz2015-08-192-3/+4
| * | | | | | | | | | | | | | | | transport: remove git_transport_options.push_certDave Borowitz2015-08-192-4/+0
| * | | | | | | | | | | | | | | | gitremote-helpers.txt: document pushcert optionDave Borowitz2015-08-191-0/+3
| * | | | | | | | | | | | | | | | Documentation/git-send-pack.txt: document --signedDave Borowitz2015-08-191-1/+9
| * | | | | | | | | | | | | | | | Documentation/git-send-pack.txt: wrap long synopsis lineDave Borowitz2015-08-191-1/+3
| * | | | | | | | | | | | | | | | Documentation/git-push.txt: document when --signed may failDave Borowitz2015-08-191-1/+3
* | | | | | | | | | | | | | | | | Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-318-25/+187
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-configJacob Keller2015-08-174-1/+64
| * | | | | | | | | | | | | | | | | notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-174-3/+76