summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-01-27merge-file: let conflict markers match end-of-line style of the contextLibravatar Johannes Schindelin2-4/+69
2016-01-04Git 2.6.5Libravatar Junio C Hamano3-2/+22
2016-01-04Merge branch 'jk/pending-keep-tag-name' into maintLibravatar Junio C Hamano2-2/+30
2016-01-04Merge branch 'jk/symbolic-ref-maint' into maintLibravatar Junio C Hamano2-1/+23
2016-01-04Merge branch 'jk/ident-loosen-getpwuid' into maintLibravatar Junio C Hamano3-24/+40
2016-01-04Merge branch 'jk/send-email-ssl-errors' into maintLibravatar Junio C Hamano1-0/+7
2016-01-04Merge branch 'sg/completion-no-column' into maintLibravatar Junio C Hamano1-0/+1
2015-12-21t1401: test reflog creation for git-symbolic-refLibravatar Jeff King1-0/+16
2015-12-21symbolic-ref: propagate error code from create_symref()Libravatar Jeff King2-1/+7
2015-12-17revision.c: propagate tag names from pending arrayLibravatar Jeff King2-2/+30
2015-12-16Merge branch 'sg/lock-file-commit-error' into maintLibravatar Junio C Hamano1-2/+1
2015-12-16credential-store: don't pass strerror to die_errno()Libravatar SZEDER Gábor1-2/+1
2015-12-15Update draft release notes to 2.6.5Libravatar Junio C Hamano1-0/+14
2015-12-15Merge branch 'dt/fsck-verify-pack-error' into maintLibravatar Junio C Hamano1-1/+1
2015-12-15Merge branch 'ep/ident-with-getaddrinfo' into maintLibravatar Junio C Hamano1-4/+27
2015-12-15Merge branch 'ls/p4-keep-empty-commits' into maintLibravatar Junio C Hamano3-17/+165
2015-12-15Merge branch 'jk/prune-mtime' into maintLibravatar Junio C Hamano1-2/+2
2015-12-14ident: fix undefined variable when NO_IPV6 is setLibravatar Jeff King1-1/+1
2015-12-14ident: loosen getpwuid error in non-strict modeLibravatar Jeff King1-8/+22
2015-12-11completion: remove 'git column' from porcelain commandsLibravatar SZEDER Gábor1-0/+1
2015-12-11Prepare for 2.6.5Libravatar Junio C Hamano2-1/+26
2015-12-11Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maintLibravatar Junio C Hamano1-1/+3
2015-12-11Merge branch 'sg/lock-file-commit-error' into maintLibravatar Junio C Hamano4-5/+8
2015-12-11Merge branch 'cb/t3404-shellquote' into maintLibravatar Junio C Hamano1-1/+1
2015-12-11Merge branch 'sb/doc-submodule-sync-recursive' into maintLibravatar Junio C Hamano1-1/+4
2015-12-11Merge branch 'nd/doc-check-ref-format-typo' into maintLibravatar Junio C Hamano1-1/+1
2015-12-11Merge branch 'rs/show-branch-argv-array' into maintLibravatar Junio C Hamano1-16/+8
2015-12-11Merge branch 'rs/pop-commit' into maintLibravatar Junio C Hamano10-92/+31
2015-12-11Merge branch 'as/subtree-with-spaces' into maintLibravatar Junio C Hamano2-74/+124
2015-12-11Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintLibravatar Junio C Hamano4-16/+31
2015-12-11send-email: enable SSL level 1 debug outputLibravatar John Keeping1-0/+7
2015-12-10ident: keep a flag for bogus default_emailLibravatar Jeff King1-7/+12
2015-12-10ident: make xgetpwuid_self() a static local helperLibravatar Jeff King3-15/+12
2015-12-10Documentation/git-update-index: add missing opts to synopsisLibravatar Christian Couder1-0/+1
2015-12-10git-p4: add option to keep empty commitsLibravatar Lars Schneider3-17/+165
2015-12-08Git 2.6.4Libravatar Junio C Hamano3-2/+18
2015-12-08Merge branch 'rs/status-detached-head-memcmp' into maintLibravatar Junio C Hamano1-5/+4
2015-12-08Merge branch 'ad/sha1-update-chunked' into maintLibravatar Junio C Hamano7-13/+69
2015-12-08Merge branch 'sg/bash-prompt-dirty-orphan' into maintLibravatar Junio C Hamano2-7/+31
2015-12-08Merge branch 'jk/interpret-trailers-outside-a-repository' into maintLibravatar Junio C Hamano1-1/+1
2015-12-08Merge branch 'jk/rebase-no-autostash' into maintLibravatar Junio C Hamano3-2/+16
2015-12-07revision.c: fix possible null pointer arithmeticLibravatar Stefan Naewe1-1/+3
2015-12-04t3404: fix quoting of redirect for some versions of bashLibravatar Charles Bailey1-1/+1
2015-12-04git-check-ref-format.txt: typo, s/avoids/avoid/Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2015-12-04document submodule sync --recursiveLibravatar Stefan Beller1-1/+4
2015-12-04Prepare for 2.6.4Libravatar Junio C Hamano2-1/+49
2015-12-04Merge branch 'da/difftool' into maintLibravatar Junio C Hamano2-3/+20
2015-12-04Merge branch 'dk/gc-idx-wo-pack' into maintLibravatar Junio C Hamano6-22/+78
2015-12-01verify_pack: do not ignore return value of verification functionLibravatar David Turner1-1/+1
2015-12-01Make error message after failing commit_lock_file() less confusingLibravatar SZEDER Gábor4-5/+8