summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* use local cloning if insteadOf makes a local URLmb/local-clone-after-applying-insteadofMichael Barabanov2014-07-171-12/+13
* Sync with 2.0.2Junio C Hamano2014-07-163-8/+26
|\
| * Git 2.0.2v2.0.2Junio C Hamano2014-07-163-2/+22
| * Merge branch 'jc/fix-clone-single-starting-at-a-tag' into maintJunio C Hamano2014-07-161-1/+1
| |\
| * \ Merge branch 'jk/pretty-G-format-fixes' into maintJunio C Hamano2014-07-163-9/+70
| |\ \
| * \ \ Merge branch 'rs/fix-alt-odb-path-comparison' into maintJunio C Hamano2014-07-161-1/+2
| |\ \ \
| * \ \ \ Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-1627-197/+284
| |\ \ \ \
| * \ \ \ \ Merge branch 'bc/fix-rebase-merge-skip' into maintJunio C Hamano2014-07-162-2/+18
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'maint-1.9' into maintJunio C Hamano2014-07-161-7/+5
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-164-11/+9
| | |\ \ \ \ \ \
| | | * | | | | | annotate: use argv_arrayRené Scharfe2014-07-161-7/+5
* | | | | | | | | Eighth batch for 2.1Junio C Hamano2014-07-161-1/+31
* | | | | | | | | Merge branch 'ah/fix-http-push'Junio C Hamano2014-07-161-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | http-push.c: make CURLOPT_IOCTLDATA a usable pointerah/fix-http-pushAbbaad Haider2014-07-131-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-1610-36/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fsck: simplify fsck_commit_buffer() by using commit_list_count()René Scharfe2014-07-101-16/+6
| * | | | | | | | | commit: use commit_list_append() instead of duplicating its codeRené Scharfe2014-07-101-6/+1
| * | | | | | | | | merge: simplify merge_trivial() by using commit_list_append()René Scharfe2014-07-101-6/+4
| * | | | | | | | | use strbuf_addch for adding single charactersRené Scharfe2014-07-103-3/+3
| * | | | | | | | | use strbuf_addbuf for adding strbufsRené Scharfe2014-07-104-5/+5
* | | | | | | | | | Merge branch 'jk/skip-prefix'Junio C Hamano2014-07-161-9/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tag: use skip_prefix instead of magic numbersjk/skip-prefixJeff King2014-07-101-9/+5
* | | | | | | | | | | Merge branch 'po/error-message-style'Junio C Hamano2014-07-161-0/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc: give some guidelines for error messagespo/error-message-stylePhilip Oakley2014-07-101-0/+9
* | | | | | | | | | | | Merge branch 'jl/test-lint-scripts'Junio C Hamano2014-07-161-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t/Makefile: always test all lint targets when running testsjl/test-lint-scriptsJens Lehmann2014-07-101-1/+1
| * | | | | | | | | | | | t/Makefile: check helper scripts for non-portable shell commands tooJens Lehmann2014-07-101-1/+2
* | | | | | | | | | | | | Merge branch 'zk/log-graph-showsig'Junio C Hamano2014-07-162-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | log: fix indentation for --graph --show-signaturezk/log-graph-showsigZoltan Klinger2014-07-092-0/+32
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mg/fix-log-mergetag-color'Junio C Hamano2014-07-161-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | log: correctly identify mergetag signature verification statusmg/fix-log-mergetag-colorMichael J Gruber2014-07-101-10/+11
* | | | | | | | | | | | | | Merge branch 'kb/path-max-must-go'Junio C Hamano2014-07-162-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | cache.h: rename cache_def_free to cache_def_clearkb/path-max-must-goKarsten Blees2014-07-132-2/+2
* | | | | | | | | | | | | | | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges'Junio C Hamano2014-07-162-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | filter-branch: eliminate duplicate mapped parentscb/filter-branch-prune-empty-degenerate-mergesCharles Bailey2014-07-012-1/+18
* | | | | | | | | | | | | | | | Merge branch 'mk/merge-incomplete-files'Junio C Hamano2014-07-162-5/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-merge-file: do not add LF at EOF while applying unrelated changemk/merge-incomplete-filesMax Kirillov2014-06-302-2/+87
| * | | | | | | | | | | | | | | | t6023-merge-file.sh: fix and mark as broken invalid testsMax Kirillov2014-06-301-3/+3
* | | | | | | | | | | | | | | | | Merge branch 'jk/strip-suffix'Junio C Hamano2014-07-1611-84/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | prepare_packed_git_one: refactor duplicate-pack checkjk/strip-suffixJeff King2014-06-301-2/+7
| * | | | | | | | | | | | | | | | | verify-pack: use strbuf_strip_suffixJeff King2014-06-301-4/+3
| * | | | | | | | | | | | | | | | | strbuf: implement strbuf_strip_suffixJeff King2014-06-301-0/+9
| * | | | | | | | | | | | | | | | | index-pack: use strip_suffix to avoid magic numbersJeff King2014-06-301-15/+14
| * | | | | | | | | | | | | | | | | use strip_suffix instead of ends_with in simple casesJeff King2014-06-304-15/+14
| * | | | | | | | | | | | | | | | | replace has_extension with ends_withJeff King2014-06-306-19/+12
| * | | | | | | | | | | | | | | | | implement ends_with via strip_suffixJeff King2014-06-302-10/+6
| * | | | | | | | | | | | | | | | | add strip_suffix functionJeff King2014-06-301-0/+27
| * | | | | | | | | | | | | | | | | sha1_file: replace PATH_MAX buffer with strbuf in prepare_packed_git_one()René Scharfe2014-06-301-26/+16
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ep/submodule-code-cleanup'Junio C Hamano2014-07-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | submodule.c: use the ARRAY_SIZE macroep/submodule-code-cleanupElia Pinto2014-06-301-1/+1
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |