summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hj/pretty-naked-decoration'Junio C Hamano2014-09-295-11/+35
|\
| * pretty: add %D format specifierHarry Jeffery2014-09-195-11/+35
* | Merge branch 'maint'Junio C Hamano2014-09-282-50/+51
|\ \
| * \ Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2014-09-282-50/+51
| |\ \
| | * | l10n: de.po: use comma before "um"Phillip Sz2014-09-251-43/+43
| | * | l10n: de.po: change Email to E-MailPhillip Sz2014-09-251-7/+7
| | * | po/TEAMS: add new member to German translation teamRalf Thielow2014-09-251-0/+1
| | |/
* | | Update draft release notes to 2.2Junio C Hamano2014-09-261-0/+21
* | | Merge branch 'sb/help-unknown-command-sort-fix'Junio C Hamano2014-09-261-1/+1
|\ \ \
| * | | help: fix the size passed to qsortStefan Beller2014-09-181-1/+1
* | | | Merge branch 'jk/branch-verbose-merged'Junio C Hamano2014-09-262-14/+48
|\ \ \ \
| * | | | branch: clean up commit flags after merge-filter walkJeff King2014-09-182-14/+48
* | | | | Merge branch 'rs/realloc-array'Junio C Hamano2014-09-2628-70/+45
|\ \ \ \ \
| * | | | | use REALLOC_ARRAY for changing the allocation size of arraysRené Scharfe2014-09-1826-70/+40
| * | | | | add macro REALLOC_ARRAYRené Scharfe2014-09-182-0/+5
* | | | | | Merge branch 'jk/close-stderr-of-credential-cache-deamon'Junio C Hamano2014-09-262-5/+26
|\ \ \ \ \ \
| * | | | | | credential-cache: close stderr in daemon processJeff King2014-09-162-5/+26
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jc/ignore-sigpipe-while-running-hooks'Junio C Hamano2014-09-262-0/+19
|\ \ \ \ \ \
| * | | | | | receive-pack: allow hooks to ignore its standard input streamJunio C Hamano2014-09-172-0/+19
| |/ / / / /
* | | | | | Merge branch 'jk/prune-packed-server-info'Junio C Hamano2014-09-263-61/+86
|\ \ \ \ \ \
| * | | | | | repack: call prune_packed_objects() and update_server_info() directlyRené Scharfe2014-09-151-17/+6
| * | | | | | server-info: clean up after writing info/packsJeff King2014-09-151-0/+9
| * | | | | | make update-server-info more robustJeff King2014-09-151-45/+71
| * | | | | | prune-packed: fix minor memory leakJeff King2014-09-151-0/+1
| |/ / / / /
* | | | | | Merge branch 'jc/hash-object-fsck-tag'Junio C Hamano2014-09-261-0/+19
|\ \ \ \ \ \
| * | | | | | t1450: make sure fsck detects a malformed tagger lineJunio C Hamano2014-09-121-0/+19
| * | | | | | Merge branch 'js/fsck-tag-validation' into HEADJunio C Hamano2014-09-129-20/+188
| |\ \ \ \ \ \
* | | | | | | | Merge branch 'jc/hash-object'Junio C Hamano2014-09-261-42/+61
|\| | | | | | |
| * | | | | | | hash-object: add --literally optionJunio C Hamano2014-09-111-9/+36
| * | | | | | | hash-object: pass 'write_object' as a flagJunio C Hamano2014-09-111-17/+15
| * | | | | | | hash-object: reduce file-scope staticsJunio C Hamano2014-09-111-29/+23
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'js/fsck-tag-validation'Junio C Hamano2014-09-269-20/+188
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Make sure that index-pack --strict checks tag objectsJohannes Schindelin2014-09-121-0/+19
| * | | | | | Add regression tests for stricter tag fsck'ingJohannes Schindelin2014-09-111-0/+19
| * | | | | | fsck: check tag objects' headersJohannes Schindelin2014-09-111-1/+85
| * | | | | | Make sure fsck_commit_buffer() does not run out of the bufferJohannes Schindelin2014-09-111-0/+23
| * | | | | | fsck_object(): allow passing object data separately from the object itselfJohannes Schindelin2014-09-105-16/+31
| * | | | | | Refactor type_from_string() to allow continuing after detecting an errorJohannes Schindelin2014-09-102-3/+11
* | | | | | | Merge branch 'jk/faster-name-conflicts'Junio C Hamano2014-09-262-33/+120
|\ \ \ \ \ \ \
| * | | | | | | refs: speed up is_refname_availableJeff King2014-09-122-33/+120
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/write-packed-refs-via-stdio'Junio C Hamano2014-09-263-23/+33
|\ \ \ \ \ \ \
| * | | | | | | refs: write packed_refs file using stdioJeff King2014-09-103-23/+33
| | |/ / / / / | |/| | | | |
* | | | | | | Update draft release notes to 2.2Junio C Hamano2014-09-191-12/+51
* | | | | | | Sync with Git 2.1.1Junio C Hamano2014-09-192-1/+46
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Git 2.1.1v2.1.1Junio C Hamano2014-09-194-3/+48
| * | | | | | Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maintJunio C Hamano2014-09-191-1/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' into maintJunio C Hamano2014-09-191-4/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/prune-top-level-refs-after-packing' into maintJunio C Hamano2014-09-192-1/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/fast-import-fixes' into maintJunio C Hamano2014-09-191-8/+13
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maintJunio C Hamano2014-09-192-21/+27
| |\ \ \ \ \ \ \ \ \ \