Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | path: implement common_dir handling in git_pathdup_submodule()mk/submodule-gitdir-path | Max Kirillov | 2015-09-14 | 4 | -9/+41 |
* | submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb() | Max Kirillov | 2015-09-14 | 1 | -8/+1 |
* | Git 2.6-rc0v2.6.0-rc0 | Junio C Hamano | 2015-09-02 | 2 | -4/+13 |
* | Merge branch 'cc/trailers-corner-case-fix' | Junio C Hamano | 2015-09-02 | 2 | -4/+25 |
|\ | |||||
| * | trailer: support multiline titlecc/trailers-corner-case-fix | Christian Couder | 2015-08-31 | 2 | -4/+25 |
* | | Merge branch 'sb/read-cache-one-indent-style-fix' | Junio C Hamano | 2015-09-02 | 1 | -1/+1 |
|\ \ | |||||
| * | | read-cache: fix indentation in read_index_fromsb/read-cache-one-indent-style-fix | Stefan Beller | 2015-08-31 | 1 | -1/+1 |
* | | | Merge branch 'ee/clean-test-fixes' | Junio C Hamano | 2015-09-02 | 1 | -12/+4 |
|\ \ \ | |||||
| * | | | t7300: fix broken && chainsee/clean-test-fixes | Erik Elfström | 2015-08-31 | 1 | -12/+4 |
* | | | | Merge branch 'jk/log-missing-default-HEAD' | Junio C Hamano | 2015-09-02 | 2 | -1/+30 |
|\ \ \ \ | |||||
| * | | | | log: diagnose empty HEAD more clearlyjk/log-missing-default-HEAD | Jeff King | 2015-08-31 | 2 | -1/+30 |
* | | | | | Ninth batch for 2.6 | Junio C Hamano | 2015-09-01 | 1 | -0/+22 |
* | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd... | Junio C Hamano | 2015-09-01 | 3 | -5/+15 |
|\ \ \ \ \ | |||||
| * | | | | | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-update | David Turner | 2015-08-31 | 3 | -5/+15 |
* | | | | | | Merge branch 'rt/remove-hold-lockfile-for-append' | Junio C Hamano | 2015-09-01 | 2 | -57/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | lockfile: remove function "hold_lock_file_for_append"rt/remove-hold-lockfile-for-append | Ralf Thielow | 2015-08-28 | 2 | -57/+7 |
* | | | | | | | Merge branch 'rs/archive-zip-many' | Junio C Hamano | 2015-09-01 | 2 | -5/+134 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | archive-zip: support more than 65535 entriesrs/archive-zip-many | René Scharfe | 2015-08-28 | 2 | -4/+91 |
| * | | | | | | | archive-zip: use a local variable to store the creator version | René Scharfe | 2015-08-28 | 1 | -2/+4 |
| * | | | | | | | t5004: test ZIP archives with many entries | René Scharfe | 2015-08-28 | 1 | -0/+40 |
* | | | | | | | | Merge branch 'ls/p4-fold-case-client-specs' | Junio C Hamano | 2015-09-01 | 2 | -0/+207 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-p4: honor core.ignorecase when using P4 client specsls/p4-fold-case-client-specs | Lars Schneider | 2015-08-28 | 2 | -0/+207 |
* | | | | | | | | | Merge branch 'ah/submodule-typofix-in-error' | Junio C Hamano | 2015-09-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-submodule: remove extraneous space from error messageah/submodule-typofix-in-error | Alex Henrie | 2015-08-28 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'ah/reflog-typofix-in-error' | Junio C Hamano | 2015-09-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | reflog: add missing single quote to error messageah/reflog-typofix-in-error | Alex Henrie | 2015-08-28 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'ah/read-tree-usage-string' | Junio C Hamano | 2015-09-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | read-tree: replace bracket set with parentheses to clarify usageah/read-tree-usage-string | Alex Henrie | 2015-08-28 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'ah/pack-objects-usage-strings' | Junio C Hamano | 2015-09-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | pack-objects: place angle brackets around placeholders in usage stringsah/pack-objects-usage-strings | Alex Henrie | 2015-08-28 | 1 | -2/+2 |
* | | | | | | | | | | | | | Merge branch 'br/svn-doc-include-paths-config' | Junio C Hamano | 2015-09-01 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | git-svn doc: mention "svn-remote.<name>.include-paths"br/svn-doc-include-paths-config | Brett Randall | 2015-08-26 | 1 | -0/+3 |
* | | | | | | | | | | | | | | Merge branch 'nd/fixup-linked-gitdir' | Junio C Hamano | 2015-09-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | setup: update the right file in multiple checkoutsnd/fixup-linked-gitdir | Nguyễn Thái Ngọc Duy | 2015-08-25 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | Eighth batch for 2.6 | Junio C Hamano | 2015-08-31 | 1 | -0/+39 |
* | | | | | | | | | | | | | | | Merge branch 'sg/describe-contains' | Junio C Hamano | 2015-08-31 | 3 | -6/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | describe --contains: default to HEAD when no commit-ish is givensg/describe-contains | SZEDER Gábor | 2015-08-25 | 3 | -6/+14 |
* | | | | | | | | | | | | | | | | Merge branch 'db/push-sign-if-asked' | Junio C Hamano | 2015-08-31 | 14 | -152/+253 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | push: add a config option push.gpgSign for default signed pushesdb/push-sign-if-asked | Dave Borowitz | 2015-08-19 | 3 | -15/+70 |
| * | | | | | | | | | | | | | | | | push: support signing pushes iff the server supports it | Dave Borowitz | 2015-08-19 | 10 | -49/+128 |
| * | | | | | | | | | | | | | | | | builtin/send-pack.c: use parse_options API | Dave Borowitz | 2015-08-19 | 1 | -104/+59 |
| * | | | | | | | | | | | | | | | | config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_... | Dave Borowitz | 2015-08-19 | 2 | -3/+4 |
| * | | | | | | | | | | | | | | | | transport: remove git_transport_options.push_cert | Dave Borowitz | 2015-08-19 | 2 | -4/+0 |
| * | | | | | | | | | | | | | | | | gitremote-helpers.txt: document pushcert option | Dave Borowitz | 2015-08-19 | 1 | -0/+3 |
| * | | | | | | | | | | | | | | | | Documentation/git-send-pack.txt: document --signed | Dave Borowitz | 2015-08-19 | 1 | -1/+9 |
| * | | | | | | | | | | | | | | | | Documentation/git-send-pack.txt: wrap long synopsis line | Dave Borowitz | 2015-08-19 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | | | Documentation/git-push.txt: document when --signed may fail | Dave Borowitz | 2015-08-19 | 1 | -1/+3 |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/notes-merge-config' | Junio C Hamano | 2015-08-31 | 8 | -25/+187 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-config | Jacob Keller | 2015-08-17 | 4 | -1/+64 |
| * | | | | | | | | | | | | | | | | | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 2015-08-17 | 4 | -3/+76 |