summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* tests: rename a test having to do with shallow submodulesab/clone-no-tagsÆvar Arnfjörð Bjarmason2017-05-011-0/+0
* clone: add a --no-tags option to clone without tagsÆvar Arnfjörð Bjarmason2017-05-014-5/+99
* tests: change "cd ... && git fetch" to "cd &&\n\tgit fetch"Ævar Arnfjörð Bjarmason2017-05-011-9/+18
* Twelfth batch for 2.13Junio C Hamano2017-04-161-0/+16
* Merge branch 'js/difftool-builtin'Junio C Hamano2017-04-162-18/+39
|\
| * difftool: fix use-after-freejs/difftool-builtinJohannes Schindelin2017-04-132-2/+24
| * difftool: avoid strcpyJeff King2017-03-301-16/+15
* | Merge branch 'sb/unpack-trees-would-lose-submodule-message-update'Junio C Hamano2017-04-161-1/+1
|\ \
| * | unpack-trees.c: align submodule error message to the other error messagessb/unpack-trees-would-lose-submodule-message-updateStefan Beller2017-03-291-1/+1
* | | Merge branch 'ab/regen-perl-mak-with-different-perl'Junio C Hamano2017-04-161-0/+1
|\ \ \
| * | | perl: regenerate perl.mak if perl -V changesab/regen-perl-mak-with-different-perlÆvar Arnfjörð Bjarmason2017-03-291-0/+1
* | | | Merge branch 'sb/show-diff-for-submodule-in-diff-fix'Junio C Hamano2017-04-162-0/+30
|\ \ \ \
| * | | | diff: submodule inline diff to initialize env array.sb/show-diff-for-submodule-in-diff-fixStefan Beller2017-04-022-0/+30
| |/ / /
* | | | Merge branch 'qp/bisect-docfix'Junio C Hamano2017-04-161-1/+1
|\ \ \ \
| * | | | git-bisect.txt: add missing wordqp/bisect-docfixQuentin Pradet2017-04-011-1/+1
* | | | | Merge branch 'mm/ls-files-s-doc'Junio C Hamano2017-04-161-1/+1
|\ \ \ \ \
| * | | | | Documentation: document elements in "ls-files -s" output in ordermm/ls-files-s-docMostyn Bramley-Moore2017-04-011-1/+1
| |/ / / /
* | | | | Merge branch 'jk/loose-object-info-report-error'Junio C Hamano2017-04-163-1/+27
|\ \ \ \ \
| * | | | | index-pack: detect local corruption in collision checkjk/loose-object-info-report-errorJeff King2017-04-012-0/+19
| * | | | | sha1_loose_object_info: return error for corrupted objectsJeff King2017-04-012-1/+8
| |/ / / /
* | | | | Merge branch 'jc/bs-t-is-not-a-tab-for-sed'Junio C Hamano2017-04-161-2/+2
|\ \ \ \ \
| * | | | | contrib/git-resurrect.sh: do not write \t for HT in sed scriptsjc/bs-t-is-not-a-tab-for-sedJunio C Hamano2017-03-311-2/+2
* | | | | | Merge branch 'jc/unused-symbols'Junio C Hamano2017-04-162-2/+1
|\ \ \ \ \ \
| * | | | | | remote.[ch]: parse_push_cas_option() can be staticjc/unused-symbolsJunio C Hamano2017-03-312-2/+1
* | | | | | | Merge branch 'jk/snprintf-cleanups'Junio C Hamano2017-04-1628-224/+239
|\ \ \ \ \ \ \
| * | | | | | | daemon: use an argv_array to exec childrenJeff King2017-03-301-21/+17
| * | | | | | | gc: replace local buffer with git_pathJeff King2017-03-301-7/+1
| * | | | | | | transport-helper: replace checked snprintf with xsnprintfJeff King2017-03-301-4/+1
| * | | | | | | convert unchecked snprintf into xsnprintfJeff King2017-03-305-11/+11
| * | | | | | | combine-diff: replace malloc/snprintf with xstrfmtJeff King2017-03-301-3/+4
| * | | | | | | replace unchecked snprintf calls with heap buffersJeff King2017-03-304-14/+17
| * | | | | | | receive-pack: print --pack-header directly into argv arrayJeff King2017-03-301-7/+10
| * | | | | | | name-rev: replace static buffer with strbufJeff King2017-03-301-9/+12
| * | | | | | | create_branch: use xstrfmt for reflog messageJeff King2017-03-301-5/+4
| * | | | | | | create_branch: move msg setup closer to point of useJeff King2017-03-301-8/+9
| * | | | | | | avoid using mksnpath for refsJeff King2017-03-301-18/+26
| * | | | | | | avoid using fixed PATH_MAX buffers for refsJeff King2017-03-304-39/+41
| * | | | | | | fetch: use heap buffer to format reflogJeff King2017-03-301-2/+4
| * | | | | | | tag: use strbuf to format tag headerJeff King2017-03-301-15/+12
| * | | | | | | diff: avoid fixed-size buffer for patch-idsJeff King2017-03-301-31/+37
| * | | | | | | odb_mkstemp: use git_path_bufJeff King2017-03-281-4/+2
| * | | | | | | odb_mkstemp: write filename into strbufJeff King2017-03-286-27/+30
| * | | | | | | do not check odb_mkstemp return value for errorsJeff King2017-03-284-8/+10
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Eleventh batch for 2.13Junio C Hamano2017-04-111-0/+14
* | | | | | | Merge branch 'ls/travis-relays-for-windows-ci'Junio C Hamano2017-04-112-0/+85
|\ \ \ \ \ \ \
| * | | | | | | travis-ci: build and test Git on WindowsLars Schneider2017-03-282-0/+85
* | | | | | | | Merge branch 'cc/untracked'Junio C Hamano2017-04-111-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | update-index: fix xgetcwd() related memory leakcc/untrackedChristian Couder2017-03-301-1/+5
* | | | | | | | | Merge branch 'ah/log-decorate-default-to-auto'Junio C Hamano2017-04-112-2/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | log: if --decorate is not given, default to --decorate=autoAlex Henrie2017-03-242-2/+17