summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | run_diff_files(): clarify computation of sha1 validityjc/diff-files-itaJunio C Hamano2015-02-041-2/+6
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ps/submodule-sanitize-path-upon-add'Junio C Hamano2015-02-222-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | git-submodule.sh: fix '/././' path normalizationps/submodule-sanitize-path-upon-addPatrick Steinhardt2015-02-022-1/+18
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/merge-file-prefix'Junio C Hamano2015-02-222-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | merge-file: correctly open files when in a subdirab/merge-file-prefixAleksander Boruch-Gruszecki2015-02-112-2/+4
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/blame-commit-info-fix'Junio C Hamano2015-02-221-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/blame: destroy initialized commit_info onlyes/blame-commit-info-fixEric Sunshine2015-02-101-3/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/check-builtins-on-windows'Junio C Hamano2015-02-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | check-builtins: strip executable suffix $X when enumerating builtinsss/check-builtins-on-windowsSebastian Schuberth2015-02-051-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #3)Junio C Hamano2015-02-181-0/+31
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/push-cert'Junio C Hamano2015-02-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | transport-helper: fix typo in error message when --signed is not supportedMike Hommey2015-02-121-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/decimal-width-for-uintmax'Junio C Hamano2015-02-182-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | decimal_width: avoid integer overflowjk/decimal-width-for-uintmaxJeff King2015-02-052-5/+5
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-no-ungetc-eof'Junio C Hamano2015-02-182-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | config_buf_ungetc: warn when pushing back a random characterjk/config-no-ungetc-eofJeff King2015-02-051-2/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | config: do not ungetc EOFJeff King2015-02-052-1/+11
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2015-02-181-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | ewah: fix building with gcc < 3.4.0jk/pack-bitmapTom G. Christensen2015-02-041-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/remote-set-url-doc'Junio C Hamano2015-02-181-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-remote.txt: stress that set-url is not for triangularjc/remote-set-url-docJunio C Hamano2015-01-291-6/+14
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ch/new-gpg-drops-rfc-1991'Junio C Hamano2015-02-182-0/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/lib-gpg: sanity-check that we can actually signch/new-gpg-drops-rfc-1991Jeff King2015-01-291-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/lib-gpg: include separate public keys in keyring.gpgJeff King2015-01-292-0/+56
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ye/http-accept-language'Junio C Hamano2015-02-183-0/+191
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http: add Accept-Language header if possibleYi EungJun2015-01-283-0/+191
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'av/wincred-with-at-in-username-fix'Junio C Hamano2015-02-181-3/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wincred: fix get credential if username has "@"av/wincred-with-at-in-username-fixAleksey Vasenev2015-01-251-3/+22
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #2)Junio C Hamano2015-02-171-0/+48
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/push-repo-option-doc'Junio C Hamano2015-02-171-16/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-push.txt: document the behavior of --repomg/push-repo-option-docMichael J Gruber2015-01-281-16/+2
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/t4122-use-test-write-lines'Junio C Hamano2015-02-171-9/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4122: use test_write_lines from test-lib-functionsjc/t4122-use-test-write-linesJunio C Hamano2015-01-281-9/+2
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/status-read-branch-name-fix'Junio C Hamano2015-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | read_and_strip_branch: fix typo'd address-of operatorjk/status-read-branch-name-fixJeff King2015-01-281-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null'Junio C Hamano2015-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not check truth value of flex arraysjk/remote-curl-an-array-in-struct-cannot-be-nullJeff King2015-01-281-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-format-doc'Junio C Hamano2015-02-171-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff-format doc: a score can follow M for rewritejc/diff-format-docJunio C Hamano2015-01-281-1/+2
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/dumb-http-idx-fetch-fix'Junio C Hamano2015-02-172-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | dumb-http: do not pass NULL path to parse_pack_indexjk/dumb-http-idx-fetch-fixJeff King2015-01-272-1/+19
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/commit-author-no-match-malformed-message'Junio C Hamano2015-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | commit: reword --author error messagemg/commit-author-no-match-malformed-messageMichael J Gruber2015-01-261-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/doc-log-rev-list-options'Junio C Hamano2015-02-171-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: what does "git log --indexed-objects" even mean?jc/doc-log-rev-list-optionsJunio C Hamano2015-01-231-5/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-ws-fix-expands'Junio C Hamano2015-02-172-3/+149
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | apply: count the size of postimage correctlyjc/apply-ws-fix-expandsJunio C Hamano2015-01-221-2/+21
| * | | | | | | | | | | | | | | | | | | | | | | | | | apply: make update_pre_post_images() sanity check the given postlenJunio C Hamano2015-01-222-0/+127
| * | | | | | | | | | | | | | | | | | | | | | | | | | apply.c: typofixJunio C Hamano2015-01-221-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/add-i-empty-candidates'Junio C Hamano2015-02-171-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |