summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2014-12-17Sync with v1.8.5.6Libravatar Junio C Hamano16-39/+297
2014-12-17Git 1.8.5.6Libravatar Junio C Hamano4-3/+38
2014-12-17Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Libravatar Junio C Hamano14-38/+261
2014-12-17fsck: complain about NTFS ".git" aliases in treesLibravatar Johannes Schindelin2-3/+9
2014-12-17read-cache: optionally disallow NTFS .git variantsLibravatar Johannes Schindelin7-0/+34
2014-12-17path: add is_ntfs_dotgit() helperLibravatar Johannes Schindelin2-0/+34
2014-12-17fsck: complain about HFS+ ".git" aliases in treesLibravatar Jeff King2-4/+7
2014-12-17read-cache: optionally disallow HFS+ .git variantsLibravatar Jeff King8-5/+45
2014-12-17utf8: add is_hfs_dotgit() helperLibravatar Jeff King2-0/+72
2014-12-17fsck: notice .git case-insensitivelyLibravatar Jeff King2-1/+2
2014-12-17t1450: refactor ".", "..", and ".git" fsck testsLibravatar Jeff King1-30/+27
2014-12-17verify_dotfile(): reject .git case-insensitivelyLibravatar Jeff King2-2/+4
2014-12-17read-tree: add tests for confusing paths like ".." and ".git"Libravatar Jeff King1-0/+32
2014-12-17unpack-trees: propagate errors adding entries to the indexLibravatar Jeff King1-4/+6
2014-12-16tests: make comment on GPG keyring match the codeLibravatar Christian Hesse1-3/+13
2014-12-12git-prompt.sh: make $f local to __git_eread()Libravatar Justin Guenther1-1/+1
2014-12-12Second batch for 2.3 cycleLibravatar Junio C Hamano1-0/+18
2014-12-12Merge branch 'jk/pack-bitmap'Libravatar Junio C Hamano4-18/+29
2014-12-12Merge branch 'jk/push-simple'Libravatar Junio C Hamano2-6/+34
2014-12-12Merge branch 'da/difftool-mergetool-simplify-reporting-status'Libravatar Junio C Hamano6-29/+12
2014-12-12Merge branch 'jk/colors-fix'Libravatar Junio C Hamano3-14/+25
2014-12-12Merge branch 'rt/push-recurse-submodule-usage-string'Libravatar Junio C Hamano1-1/+1
2014-12-12Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change'Libravatar Junio C Hamano1-4/+10
2014-12-12Merge branch 'jk/no-perl-tests'Libravatar Junio C Hamano3-4/+4
2014-12-12Merge branch 'sv/typofix-apply-error-message'Libravatar Junio C Hamano1-1/+1
2014-12-12Merge branch 'po/everyday-doc'Libravatar Junio C Hamano1-1/+1
2014-12-12Merge branch 'mh/config-copy-string-from-git-path'Libravatar Junio C Hamano1-2/+5
2014-12-12Merge branch 'jc/unpack-trees-plug-leak'Libravatar Junio C Hamano1-0/+2
2014-12-12tests: squelch noise from GPG machinery set-upLibravatar Junio C Hamano1-12/+14
2014-12-12tests: replace binary GPG keyrings with ASCII-armored keysLibravatar Christian Hesse4-2/+89
2014-12-12use strbuf_complete_line() for adding a newline if neededLibravatar René Scharfe3-7/+3
2014-12-12tests: skip RFC1991 tests for gnupg 2.1Libravatar Christian Hesse2-7/+11
2014-12-12tests: create gpg homedir on the flyLibravatar Christian Hesse4-3/+11
2014-12-11commit: always populate GIT_AUTHOR_* variablesLibravatar Jeff King1-21/+5
2014-12-11commit: loosen ident checks when generating templateLibravatar Jeff King1-9/+14
2014-12-11index-format.txt: add a missing closing quoteLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2014-12-11t: support clang/gcc AddressSanitizerLibravatar Jeff King2-0/+4
2014-12-10Show number of TODO items for interactive rebaseLibravatar Onno Kortmann1-1/+3
2014-12-10pkt-line: allow writing of LARGE_PACKET_MAX buffersLibravatar Jeff King2-18/+52
2014-12-10read_packed_refs: use skip_prefix instead of static arrayLibravatar Jeff King1-3/+2
2014-12-10read_packed_refs: pass strbuf to parse_ref_lineLibravatar Jeff King1-12/+15
2014-12-10read_packed_refs: use a strbuf for reading linesLibravatar Jeff King1-9/+11
2014-12-09branch: allow -f with -m and -dLibravatar Michael J Gruber2-4/+14
2014-12-09parse_color: drop COLOR_BACKGROUND macroLibravatar Jeff King1-5/+4
2014-12-09git-am.txt: --ignore-date flag is not passed to git-applyLibravatar Ronald Wampler1-1/+0
2014-12-09gitignore.txt: do not suggest assume-unchangedLibravatar Michael J Gruber1-4/+0
2014-12-09doc: make clear --assume-unchanged's user contractLibravatar Philip Oakley1-10/+8
2014-12-09test-hashmap: squelch gcc compiler warningLibravatar Johannes Schindelin1-1/+1
2014-12-09index-pack: terminate object buffers with NULLibravatar Duy Nguyen2-3/+3
2014-12-09fsck: properly bound "invalid tag name" error messageLibravatar Jeff King2-3/+8