summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | 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 'jc/remote-set-url-doc' into maintJunio C Hamano2015-03-051-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 'jk/pack-bitmap' into maintJunio C Hamano2015-03-051-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ewah: fix building with gcc < 3.4.0jk/pack-bitmapTom G. Christensen2015-02-041-1/+2
* | | | | | | | | | | | Merge branch 'jk/config-no-ungetc-eof' into maintJunio C Hamano2015-03-052-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/decimal-width-for-uintmax' into maintJunio C Hamano2015-03-052-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | decimal_width: avoid integer overflowjk/decimal-width-for-uintmaxJeff King2015-02-052-5/+5
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/push-cert' into maintJunio C Hamano2015-03-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | transport-helper: fix typo in error message when --signed is not supportedMike Hommey2015-02-121-1/+1
* | | | | | | | | | | | | Merge branch 'mh/deref-symref-over-helper-transport' into maintJunio C Hamano2015-03-053-6/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | transport-helper: do not request symbolic refs to remote helpersmh/deref-symref-over-helper-transportMike Hommey2015-01-213-6/+39
* | | | | | | | | | | | | | Merge branch 'ks/rebase-i-abbrev' into maintJunio C Hamano2015-03-052-9/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase -i: use full object name internally throughout the scriptks/rebase-i-abbrevKirill A. Shutemov2015-01-222-9/+15
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'dp/remove-duplicated-header-inclusion' into maintJunio C Hamano2015-03-054-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | do not include the same header twicedp/remove-duplicated-header-inclusionДилян Палаузов2015-02-134-4/+0
* | | | | | | | | | | | | | | Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maintJunio C Hamano2015-03-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | hex.c: reduce memory footprint of sha1_to_hex static bufferssb/hex-object-name-is-at-most-41-bytes-longStefan Beller2015-02-131-1/+1
* | | | | | | | | | | | | | | | Merge branch 'ak/git-pm-typofix' into maintJunio C Hamano2015-03-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Git.pm: two minor typo fixesak/git-pm-typofixAlexander Kuleshov2015-02-181-2/+2
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/sanity' into maintJunio C Hamano2015-03-054-9/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | test-lib.sh: set prerequisite SANITY by testing what we really needTorsten Bögershausen2015-02-151-3/+22
| * | | | | | | | | | | | | | | | tests: correct misuses of POSIXPERMJunio C Hamano2015-01-162-5/+14
| * | | | | | | | | | | | | | | | t/lib-httpd: switch SANITY check for NOT_ROOTJeff King2015-01-162-1/+6
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Git 2.3.1v2.3.1Junio C Hamano2015-02-244-3/+56
* | | | | | | | | | | | | | | | Merge branch 'ak/add-i-empty-candidates' into maintJunio C Hamano2015-02-241-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | add -i: return from list_and_choose if there is no candidateak/add-i-empty-candidatesAlexander Kuleshov2015-01-221-0/+5
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano2015-02-242-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 'jc/doc-log-rev-list-options' into maintJunio C Hamano2015-02-241-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 'mg/commit-author-no-match-malformed-message' into maintJunio C Hamano2015-02-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | commit: reword --author error messagemg/commit-author-no-match-malformed-messageMichael J Gruber2015-01-261-1/+1
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/dumb-http-idx-fetch-fix' into maintJunio C Hamano2015-02-242-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 'jc/diff-format-doc' into maintJunio C Hamano2015-02-241-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | diff-format doc: a score can follow M for rewritejc/diff-format-docJunio C Hamano2015-01-281-1/+2
| | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maintJunio C Hamano2015-02-241-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 'jk/status-read-branch-name-fix' into maintJunio C Hamano2015-02-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | read_and_strip_branch: fix typo'd address-of operatorjk/status-read-branch-name-fixJeff King2015-01-281-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'mg/push-repo-option-doc' into maintJunio C Hamano2015-02-241-16/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git-push.txt: document the behavior of --repomg/push-repo-option-docMichael J Gruber2015-01-281-16/+2
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maintJunio C Hamano2015-02-241-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | remote-curl: fall back to Basic auth if Negotiate failsbc/http-fallback-to-password-after-krb-failsbrian m. carlson2015-01-071-0/+10