summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* http: add HTTP_KEEP_ERROR optionJeff King2013-04-062-0/+38
* Update draft release notes to 1.8.3Junio C Hamano2013-04-051-0/+12
* Merge branch 'mh/rev-parse-verify-doc'Junio C Hamano2013-04-051-4/+15
|\
| * rev-parse: clarify documentation for the --verify optionMichael Haggerty2013-04-021-4/+15
* | Merge branch 'sg/gpg-sig'Junio C Hamano2013-04-0513-82/+219
|\ \
| * | pretty printing: extend %G? to include 'N' and 'U'Sebastian Götte2013-03-312-1/+4
| * | merge/pull Check for untrusted good GPG signaturesSebastian Götte2013-03-3110-12/+29
| * | merge/pull: verify GPG signatures of commits being mergedSebastian Götte2013-03-314-3/+98
| * | commit.c/GPG signature verification: Also look at the first GPG status lineSebastian Götte2013-03-311-5/+12
| * | Move commit GPG signature verification to commit.cSebastian Götte2013-03-314-78/+93
* | | Merge branch 'jl/submodule-deinit'Junio C Hamano2013-04-052-7/+20
|\ \ \
| * | | submodule deinit: clarify work tree removal messageJens Lehmann2013-04-012-7/+20
* | | | Merge branch 'rr/send-email-perl-critique'Junio C Hamano2013-04-051-8/+10
|\ \ \ \
| * | | | send-email: use the three-arg form of open in recipients_cmdRamkumar Ramachandra2013-03-311-1/+1
| * | | | send-email: drop misleading function prototypeRamkumar Ramachandra2013-03-311-4/+6
| * | | | send-email: use "return;" not "return undef;" on error codepathsRamkumar Ramachandra2013-03-311-3/+3
* | | | | Merge branch 'jc/merge-tag-object'Junio C Hamano2013-04-052-32/+81
|\ \ \ \ \
| * | | | | t6200: test message for merging of an annotated tagJunio C Hamano2013-04-011-0/+39
| * | | | | t6200: use test_config/test_unconfigJunio C Hamano2013-04-011-32/+29
| * | | | | merge: a random object may not necssarily be a commitJunio C Hamano2013-03-191-0/+13
* | | | | | Sync with maintJunio C Hamano2013-04-042-1/+2
|\ \ \ \ \ \
| * | | | | | mailmap: update Pasky's addressJunio C Hamano2013-04-041-0/+1
| * | | | | | Merge branch 'nd/index-pack-threaded-fixes' into maintJunio C Hamano2013-04-041-8/+26
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/index-pack-correct-depth-fix' into maintJunio C Hamano2013-04-041-0/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/submodule-summary-limit' into maintJunio C Hamano2013-04-041-6/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/peel-ref' into maintJunio C Hamano2013-04-042-4/+11
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-remote-mediawiki: new wiki URL in documentationMatthieu Moy2013-04-041-1/+1
* | | | | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-031-10/+31
* | | | | | | | | | | Sync with maintJunio C Hamano2013-04-033-0/+75
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Update draft release notes to 1.8.2.1Junio C Hamano2013-04-031-0/+35
| * | | | | | | | | | Merge branch 'mg/gpg-interface-using-status' into maintJunio C Hamano2013-04-037-25/+46
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/commit-complete-lines-given-via-m-option' into maintJunio C Hamano2013-04-033-15/+34
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/describe' into maintJunio C Hamano2013-04-031-21/+20
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/alias-in-bare' into maintJunio C Hamano2013-04-035-12/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/rfc2047-one-char-at-a-time' into maintJunio C Hamano2013-04-034-25/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/empty-archive' into maintJunio C Hamano2013-04-036-13/+109
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/tag-force-no-warn-on-creation' into maintJunio C Hamano2013-04-032-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lf/setup-prefix-pathspec' into maintJunio C Hamano2013-04-031-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with 1.8.1 maintenance trackJunio C Hamano2013-04-0319-164/+462
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Start preparing for 1.8.1.6Junio C Hamano2013-04-032-1/+35
| | * | | | | | | | | | | | | | | | | | Merge branch 'kb/name-hash' into maint-1.8.1Junio C Hamano2013-04-034-62/+166
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1Junio C Hamano2013-04-032-1/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1Junio C Hamano2013-04-032-74/+97
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1Junio C Hamano2013-04-039-27/+145
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1Junio C Hamano2013-04-032-1/+67
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'yd/doc-merge-annotated-tag' into maint-1.8.1Junio C Hamano2013-04-032-1/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1Junio C Hamano2013-04-031-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/perl-cat-blob' into maint-1.8.1Junio C Hamano2013-04-031-10/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1Junio C Hamano2013-04-031-0/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1Junio C Hamano2013-04-031-4/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \