summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | t6031-test-merge-recursive: do not forget to add file to be committedsb/t6031-typofixStefan Beller2014-09-221-0/+1
* | | | | | | | | | | | | | Merge branch 'sb/t9300-typofix'Junio C Hamano2014-09-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t9300-fast-import: fix typo in test descriptionsb/t9300-typofixStefan Beller2014-09-221-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'rs/remote-simplify'Junio C Hamano2014-09-291-12/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remote: simplify match_name_with_pattern() using strbufrs/remote-simplifyRené Scharfe2014-09-221-12/+5
* | | | | | | | | | | | | | | Merge branch 'rs/graph-simplify'Junio C Hamano2014-09-291-13/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | graph: simplify graph_padding_line()rs/graph-simplifyRené Scharfe2014-09-221-13/+4
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'da/rev-parse-verify-quiet'Junio C Hamano2014-09-298-27/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | stash: prefer --quiet over shell redirection of the standard error streamda/rev-parse-verify-quietDavid Aguilar2014-09-191-6/+7
| * | | | | | | | | | | | | | | refs: make rev-parse --quiet actually quietDavid Aguilar2014-09-196-16/+58
| * | | | | | | | | | | | | | | t1503: use test_must_be_emptyDavid Aguilar2014-09-161-5/+5
| * | | | | | | | | | | | | | | Documentation: a note about stdout for git rev-parse --verify --quietDavid Aguilar2014-09-151-0/+1
* | | | | | | | | | | | | | | | Merge branch 'hj/pretty-naked-decoration'Junio C Hamano2014-09-295-11/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | pretty: add %D format specifierhj/pretty-naked-decorationHarry Jeffery2014-09-185-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 qsortsb/help-unknown-command-sort-fixStefan 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 walkjk/branch-verbose-mergedJeff 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 arraysrs/realloc-arrayRené 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 processjk/close-stderr-of-credential-cache-deamonJeff 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 streamjc/ignore-sigpipe-while-running-hooksJunio C Hamano2014-09-162-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 linejc/hash-object-fsck-tagJunio 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