summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'jc/push-cert'Junio C Hamano2014-10-0823-159/+932
|\ \ \ \
| * | | | receive-pack::hmac_sha1(): copy the entire SHA-1 hash outBrian Gernhardt2014-09-251-2/+2
| * | | | signed push: allow stale nonce in stateless modeJunio C Hamano2014-09-174-12/+112
| * | | | signed push: teach smart-HTTP to pass "git push --signed" aroundJunio C Hamano2014-09-176-3/+63
| * | | | signed push: fortify against replay attacksJunio C Hamano2014-09-177-29/+187
| * | | | signed push: add "pushee" header to push certificateJunio C Hamano2014-09-154-0/+13
| * | | | signed push: remove duplicated protocol infoJunio C Hamano2014-09-154-4/+69
| * | | | send-pack: send feature request on push-cert packetJunio C Hamano2014-09-152-5/+21
| * | | | receive-pack: GPG-validate push certificatesJunio C Hamano2014-09-153-7/+66
| * | | | push: the beginning of "git push --signed"Junio C Hamano2014-09-1510-2/+253
| * | | | pack-protocol doc: typofix for PKT-LINEJunio C Hamano2014-09-151-2/+2
| * | | | gpg-interface: move parse_signature() to where it should beJunio C Hamano2014-09-154-21/+22
| * | | | gpg-interface: move parse_gpg_output() to where it should beJunio C Hamano2014-09-153-41/+47
| * | | | send-pack: clarify that cmds_sent is a booleanJunio C Hamano2014-09-151-3/+4
| * | | | send-pack: refactor inspecting and resetting status and sending commandsJunio C Hamano2014-09-151-19/+30
| * | | | send-pack: rename "new_refs" to "need_pack_data"Junio C Hamano2014-09-151-4/+3
| * | | | receive-pack: factor out capability string generationJunio C Hamano2014-09-151-8/+14
| * | | | send-pack: factor out capability string generationJunio C Hamano2014-09-151-8/+13
| * | | | send-pack: always send capabilitiesJunio C Hamano2014-09-151-3/+1
| * | | | send-pack: refactor decision to send update per refJunio C Hamano2014-09-151-15/+21
| * | | | send-pack: move REF_STATUS_REJECT_NODELETE logic a bit higherJunio C Hamano2014-09-151-5/+10
| * | | | receive-pack: factor out queueing of commandJunio C Hamano2014-09-151-21/+29
| * | | | receive-pack: do not reuse old_sha1[] for other thingsJunio C Hamano2014-09-151-3/+5
| * | | | receive-pack: parse feature request a bit earlierJunio C Hamano2014-09-151-12/+14
| * | | | receive-pack: do not overallocate command structureJunio C Hamano2014-09-151-2/+3
* | | | | Sync with maintJunio C Hamano2014-10-071-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'maint-2.0' into maintJunio C Hamano2014-10-071-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'maint-1.9' into maint-2.0Junio C Hamano2014-10-071-1/+1
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-10-071-1/+1
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | | * | | | git-tag.txt: Add a missing hyphen to `-s`Wieland Hoffmann2014-10-071-1/+1
| * | | | | | | Merge branch 'jk/mbox-from-line' into maintJunio C Hamano2014-10-076-1/+66
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Sync with 2.1.2Junio C Hamano2014-09-292-1/+22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Git 2.1.2v2.1.2Junio C Hamano2014-09-294-3/+24
| * | | | | | | | Merge branch 'jk/fsck-exit-code-fix' into maintJunio C Hamano2014-09-293-9/+87
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-294-7/+41
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mk/reachable-protect-detached-head' into maintJunio C Hamano2014-09-292-0/+25
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano2014-09-292-1/+109
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-threading-races' into maintJunio C Hamano2014-09-291-2/+31
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/send-pack-many-refspecs' into maintJunio C Hamano2014-09-295-2/+153
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'so/rebase-doc' into maintJunio C Hamano2014-09-291-6/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jt/itimer-autoconf'Junio C Hamano2014-09-292-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | autoconf: check for setitimer()jt/itimer-autoconfJonas 'Sortie' Termansen2014-08-291-0/+6
| * | | | | | | | | | | | | | | autoconf: check for struct itimervalJonas 'Sortie' Termansen2014-08-291-0/+8
| * | | | | | | | | | | | | | | git-compat-util.h: add missing semicolon after struct itimervalJonas 'Sortie' Termansen2014-08-291-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jc/test-lazy-prereq'Junio C Hamano2014-09-292-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | tests: drop GIT_*_TIMING_TESTS environment variable supportjc/test-lazy-prereqJunio C Hamano2014-06-132-4/+0
* | | | | | | | | | | | | | | | Merge branch 'sb/merge-recursive-copy-paste-fix'Junio C Hamano2014-09-291-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | merge-recursive: remove stale commented debugging codesb/merge-recursive-copy-paste-fixStefan Beller2014-09-231-4/+0
| * | | | | | | | | | | | | | | | merge-recursive: fix copy-paste mistakeStefan Beller2014-09-231-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'pr/use-default-sigpipe-setting'Junio C Hamano2014-09-293-1/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \