Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'av/wincred-with-at-in-username-fix' into maint | Junio C Hamano | 2015-03-05 | 1 | -3/+22 |
|\ | |||||
| * | wincred: fix get credential if username has "@"av/wincred-with-at-in-username-fix | Aleksey Vasenev | 2015-01-25 | 1 | -3/+22 |
* | | Merge branch 'ch/new-gpg-drops-rfc-1991' into maint | Junio C Hamano | 2015-03-05 | 2 | -0/+58 |
|\ \ | |||||
| * | | t/lib-gpg: sanity-check that we can actually signch/new-gpg-drops-rfc-1991 | Jeff King | 2015-01-29 | 1 | -0/+2 |
| * | | t/lib-gpg: include separate public keys in keyring.gpg | Jeff King | 2015-01-29 | 2 | -0/+56 |
* | | | Merge branch 'jc/remote-set-url-doc' into maint | Junio C Hamano | 2015-03-05 | 1 | -6/+14 |
|\ \ \ | |||||
| * | | | Documentation/git-remote.txt: stress that set-url is not for triangularjc/remote-set-url-doc | Junio C Hamano | 2015-01-29 | 1 | -6/+14 |
* | | | | Merge branch 'jk/pack-bitmap' into maint | Junio C Hamano | 2015-03-05 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | ewah: fix building with gcc < 3.4.0jk/pack-bitmap | Tom G. Christensen | 2015-02-04 | 1 | -1/+2 |
* | | | | | Merge branch 'jk/config-no-ungetc-eof' into maint | Junio C Hamano | 2015-03-05 | 2 | -3/+17 |
|\ \ \ \ \ | |||||
| * | | | | | config_buf_ungetc: warn when pushing back a random characterjk/config-no-ungetc-eof | Jeff King | 2015-02-05 | 1 | -2/+6 |
| * | | | | | config: do not ungetc EOF | Jeff King | 2015-02-05 | 2 | -1/+11 |
* | | | | | | Merge branch 'jk/decimal-width-for-uintmax' into maint | Junio C Hamano | 2015-03-05 | 2 | -5/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | decimal_width: avoid integer overflowjk/decimal-width-for-uintmax | Jeff King | 2015-02-05 | 2 | -5/+5 |
* | | | | | | | Merge branch 'jc/push-cert' into maint | Junio C Hamano | 2015-03-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | transport-helper: fix typo in error message when --signed is not supported | Mike Hommey | 2015-02-12 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'mh/deref-symref-over-helper-transport' into maint | Junio C Hamano | 2015-03-05 | 3 | -6/+39 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | transport-helper: do not request symbolic refs to remote helpersmh/deref-symref-over-helper-transport | Mike Hommey | 2015-01-21 | 3 | -6/+39 |
* | | | | | | | | | Merge branch 'ks/rebase-i-abbrev' into maint | Junio C Hamano | 2015-03-05 | 2 | -9/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rebase -i: use full object name internally throughout the scriptks/rebase-i-abbrev | Kirill A. Shutemov | 2015-01-22 | 2 | -9/+15 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'dp/remove-duplicated-header-inclusion' into maint | Junio C Hamano | 2015-03-05 | 4 | -4/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | do not include the same header twicedp/remove-duplicated-header-inclusion | Дилян Палаузов | 2015-02-13 | 4 | -4/+0 |
* | | | | | | | | | | Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maint | Junio C Hamano | 2015-03-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | hex.c: reduce memory footprint of sha1_to_hex static bufferssb/hex-object-name-is-at-most-41-bytes-long | Stefan Beller | 2015-02-13 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'ak/git-pm-typofix' into maint | Junio C Hamano | 2015-03-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Git.pm: two minor typo fixesak/git-pm-typofix | Alexander Kuleshov | 2015-02-18 | 1 | -2/+2 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/sanity' into maint | Junio C Hamano | 2015-03-05 | 4 | -9/+42 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | test-lib.sh: set prerequisite SANITY by testing what we really need | Torsten Bögershausen | 2015-02-15 | 1 | -3/+22 |
| * | | | | | | | | | | | tests: correct misuses of POSIXPERM | Junio C Hamano | 2015-01-16 | 2 | -5/+14 |
| * | | | | | | | | | | | t/lib-httpd: switch SANITY check for NOT_ROOT | Jeff King | 2015-01-16 | 2 | -1/+6 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Git 2.3.1v2.3.1 | Junio C Hamano | 2015-02-24 | 4 | -3/+56 |
* | | | | | | | | | | | Merge branch 'ak/add-i-empty-candidates' into maint | Junio C Hamano | 2015-02-24 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | add -i: return from list_and_choose if there is no candidateak/add-i-empty-candidates | Alexander Kuleshov | 2015-01-22 | 1 | -0/+5 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jc/apply-ws-fix-expands' into maint | Junio C Hamano | 2015-02-24 | 2 | -3/+149 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | apply: count the size of postimage correctlyjc/apply-ws-fix-expands | Junio C Hamano | 2015-01-22 | 1 | -2/+21 |
| * | | | | | | | | | | | apply: make update_pre_post_images() sanity check the given postlen | Junio C Hamano | 2015-01-22 | 2 | -0/+127 |
| * | | | | | | | | | | | apply.c: typofix | Junio C Hamano | 2015-01-22 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jc/doc-log-rev-list-options' into maint | Junio C Hamano | 2015-02-24 | 1 | -5/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Documentation: what does "git log --indexed-objects" even mean?jc/doc-log-rev-list-options | Junio C Hamano | 2015-01-23 | 1 | -5/+7 |
* | | | | | | | | | | | | Merge branch 'mg/commit-author-no-match-malformed-message' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | commit: reword --author error messagemg/commit-author-no-match-malformed-message | Michael J Gruber | 2015-01-26 | 1 | -1/+1 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/dumb-http-idx-fetch-fix' into maint | Junio C Hamano | 2015-02-24 | 2 | -1/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | dumb-http: do not pass NULL path to parse_pack_indexjk/dumb-http-idx-fetch-fix | Jeff King | 2015-01-27 | 2 | -1/+19 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'jc/diff-format-doc' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | diff-format doc: a score can follow M for rewritejc/diff-format-doc | Junio C Hamano | 2015-01-28 | 1 | -1/+2 |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | do not check truth value of flex arraysjk/remote-curl-an-array-in-struct-cannot-be-null | Jeff King | 2015-01-28 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'jk/status-read-branch-name-fix' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | read_and_strip_branch: fix typo'd address-of operatorjk/status-read-branch-name-fix | Jeff King | 2015-01-28 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge branch 'mg/push-repo-option-doc' into maint | Junio C Hamano | 2015-02-24 | 1 | -16/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |