summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-06-08am -3: support 3way merge on unborn branchLibravatar Paul Tan2-1/+11
2015-06-08am --skip: revert changes introduced by failed 3way mergeLibravatar Paul Tan2-1/+17
2015-06-08fsck: report errors if reflog entries point at invalid objectsLibravatar Michael Haggerty1-4/+9
2015-06-08fsck_handle_reflog_sha1(): new functionLibravatar Michael Haggerty1-14/+15
2015-06-08read_loose_refs(): treat NULL_SHA1 loose references as brokenLibravatar Michael Haggerty2-1/+11
2015-06-08completion: teach 'scissors' mode to 'git commit --cleanup='Libravatar SZEDER Gábor1-1/+1
2015-06-05utf8: NO_ICONV: silence uninitialized variable warningLibravatar Eric Sunshine1-1/+3
2015-06-05Git 2.4.3Libravatar Junio C Hamano4-3/+80
2015-06-05Merge branch 'dl/branch-error-message' into maintLibravatar Junio C Hamano1-3/+3
2015-06-05Merge branch 'jk/skip-http-tests-under-no-curl' into maintLibravatar Junio C Hamano8-35/+13
2015-06-05Merge branch 'ps/doc-packfile-vs-pack-file' into maintLibravatar Junio C Hamano3-9/+9
2015-06-05Merge branch 'fg/document-commit-message-stripping' into maintLibravatar Junio C Hamano1-4/+7
2015-06-05Merge branch 'jk/rerere-forget-check-enabled' into maintLibravatar Junio C Hamano1-0/+2
2015-06-05Merge branch 'pt/pull-log-n' into maintLibravatar Junio C Hamano2-2/+19
2015-06-05Merge branch 'pt/pull-ff-vs-merge-ff' into maintLibravatar Junio C Hamano3-2/+13
2015-06-05Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintLibravatar Junio C Hamano1-5/+3
2015-06-05Merge branch 'ja/tutorial-asciidoctor-fix' into maintLibravatar Junio C Hamano1-1/+1
2015-06-05Merge branch 'jk/stripspace-asciidoctor-fix' into maintLibravatar Junio C Hamano1-3/+3
2015-06-05Merge branch 'jk/asciidoc-markup-fix' into maintLibravatar Junio C Hamano19-102/+107
2015-06-05Merge branch 'ps/bundle-verify-arg' into maintLibravatar Junio C Hamano1-0/+8
2015-06-05Merge branch 'mh/write-refs-sooner-2.4' into maintLibravatar Junio C Hamano3-33/+112
2015-06-05Merge branch 'mh/ref-directory-file' into maintLibravatar Junio C Hamano3-118/+312
2015-06-05Merge branch 'mg/log-decorate-HEAD' into maintLibravatar Junio C Hamano2-11/+22
2015-06-05Merge branch 'sb/t1020-cleanup' into maintLibravatar Junio C Hamano1-4/+7
2015-06-05Merge branch 'jc/gitignore-precedence' into maintLibravatar Junio C Hamano2-3/+17
2015-06-05Merge branch 'bc/connect-plink' into maintLibravatar Junio C Hamano2-22/+67
2015-06-05Merge branch 'ph/rebase-i-redo' into maintLibravatar Junio C Hamano2-0/+63
2015-06-05Merge branch 'jk/add-e-kill-editor' into maintLibravatar Junio C Hamano2-1/+9
2015-06-05Merge branch 'mh/clone-verbosity-fix' into maintLibravatar Junio C Hamano1-2/+2
2015-06-05Merge branch 'jk/sha1-file-reduce-useless-warnings' into maintLibravatar Junio C Hamano2-6/+2
2015-06-05Merge branch 'tb/blame-resurrect-convert-to-git' into maintLibravatar Junio C Hamano2-3/+16
2015-06-05Merge branch 'jc/plug-fmt-merge-msg-leak' into maintLibravatar Junio C Hamano1-5/+11
2015-06-05Merge branch 'pt/xdg-config-path' into maintLibravatar Junio C Hamano10-81/+243
2015-06-03read_loose_refs(): simplify function logicLibravatar Michael Haggerty1-7/+12
2015-06-03ewah: use less generic macro nameLibravatar Jeff King4-23/+23
2015-06-03ewah/bitmap: silence warning about MASK macro redefinitionLibravatar Eric Sunshine1-8/+8
2015-06-02Documentation/technical/pack-protocol: mention http as possible protocolLibravatar Stefan Beller1-3/+3
2015-06-02for-each-ref: report broken references correctlyLibravatar Michael Haggerty2-1/+6
2015-06-02t6301: new tests of for-each-ref error handlingLibravatar Michael Haggerty1-0/+56
2015-06-01format-patch: do not feed tags to clear_commit_marks()Libravatar Junio C Hamano2-6/+14
2015-06-01suppress errors on missing UNINTERESTING linksLibravatar Jeff King1-1/+1
2015-06-01silence broken link warnings with revs->ignore_missing_linksLibravatar Jeff King3-2/+17
2015-06-01add quieter versions of parse_{tree,commit}Libravatar Jeff King4-6/+16
2015-05-29glossary: add "remote", "submodule", "superproject"Libravatar Stefan Beller1-0/+16
2015-05-29setup_git_directory: delay core.bare/core.worktree errorsLibravatar Jeff King2-10/+26
2015-05-29Makefile: silence perl/PM.stamp recipeLibravatar Jeff King1-1/+1
2015-05-29Makefile: avoid timestamp updates to GIT-BUILD-OPTIONSLibravatar Jeff King1-21/+22
2015-05-29Makefile: drop dependency between git-instaweb and gitwebLibravatar Jeff King1-1/+1
2015-05-28submodule doc: reorder introductory paragraphsLibravatar Stefan Beller1-28/+22
2015-05-28Documentation: include 'merge.branchdesc' for merge and config as wellLibravatar SZEDER Gábor3-16/+12