summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-06-25Merge branch 'jk/die-on-bogus-worktree-late' into maintLibravatar Junio C Hamano2-10/+26
2015-06-25Merge branch 'pt/pull-tags-error-diag' into maintLibravatar Junio C Hamano1-9/+0
2015-06-25Merge branch 'jk/color-diff-plain-is-context' into maintLibravatar Junio C Hamano5-22/+23
2015-06-25Merge branch 'jk/diagnose-config-mmap-failure' into maintLibravatar Junio C Hamano4-11/+29
2015-06-25Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintLibravatar Junio C Hamano7-9/+34
2015-06-25Merge branch 'mm/rebase-i-post-rewrite-exec' into maintLibravatar Junio C Hamano2-41/+58
2015-06-24Fix definition of ARRAY_SIZE for non-gcc buildsLibravatar Charles Bailey1-5/+3
2015-06-17test-lib.sh: fix color support when tput needs ~/.terminfoLibravatar Richard Hansen1-29/+28
2015-06-17docs: clarify that --encoding can produce invalid sequencesLibravatar Jeff King1-1/+4
2015-06-17git-checkout.txt: document "git checkout <pathspec>" betterLibravatar Torsten Bögershausen1-1/+5
2015-06-17Revert "test-lib.sh: do tests for color support after changing HOME"Libravatar Richard Hansen1-47/+43
2015-06-17fetch-pack: check for shallow if depth givenLibravatar Mike Edgar1-1/+1
2015-06-16Git 2.4.4Libravatar Junio C Hamano4-3/+39
2015-06-16Merge branch 'jk/clone-dissociate' into maintLibravatar Junio C Hamano1-13/+4
2015-06-16Merge branch 'sb/submodule-doc-intro' into maintLibravatar Junio C Hamano1-28/+22
2015-06-16Merge branch 'sb/glossary-submodule' into maintLibravatar Junio C Hamano1-0/+16
2015-06-16Merge branch 'ah/usage-strings' into maintLibravatar Junio C Hamano2-2/+2
2015-06-16Merge branch 'mc/commit-doc-grammofix' into maintLibravatar Junio C Hamano1-1/+1
2015-06-16Merge branch 'rs/janitorial' into maintLibravatar Junio C Hamano7-26/+9
2015-06-16Merge branch 'sb/test-bitmap-free-at-end' into maintLibravatar Junio C Hamano1-1/+1
2015-06-16Merge branch 'dt/clean-pathspec-filter-then-lstat' into maintLibravatar Junio C Hamano1-3/+3
2015-06-16Merge branch 'jk/http-backend-deadlock' into maintLibravatar Junio C Hamano3-29/+139
2015-06-16Merge branch 'jh/filter-empty-contents' into maintLibravatar Junio C Hamano2-1/+27
2015-06-16Merge branch 'jk/stash-options' into maintLibravatar Junio C Hamano2-1/+20
2015-06-16Merge branch 'mm/log-format-raw-doc' into maintLibravatar Junio C Hamano2-2/+14
2015-06-16Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maintLibravatar Junio C Hamano1-1/+53
2015-06-16Documentation/describe: improve one-line summaryLibravatar Matthieu Moy1-1/+1
2015-06-15Revert "stash: require a clean index to apply"Libravatar Jeff King2-9/+0
2015-06-14Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po int...Libravatar Junio C Hamano1-5/+5
2015-06-12hooks/pre-auto-gc: adjust power checking for newer OS XLibravatar Panagiotis Astithas1-1/+1
2015-06-12t0302: "unreadable" test needs SANITY prereqLibravatar Paul Tan1-1/+1
2015-06-12l10n: de.po: translation fix for fall-back to 3way mergeLibravatar Michael J Gruber1-1/+1
2015-06-12l10n: de.po: punctuation fixesLibravatar Michael J Gruber1-2/+2
2015-06-12l10n: de.po: grammar fixLibravatar Michael J Gruber1-1/+1
2015-06-12l10n: de.po: change error message from "sagen" to "Meinten Sie"Libravatar Phillip Sz1-1/+1
2015-06-10git-prompt.sh: document GIT_PS1_STATESEPARATORLibravatar Joe Cridge1-0/+4
2015-06-10doc: format-patch: fix typoLibravatar Frans Klaver1-1/+1
2015-06-09index-pack: avoid excessive re-reading of pack directoryLibravatar Jeff King3-3/+14
2015-06-09commit: cope with scissors lines in commit messageLibravatar SZEDER Gábor2-5/+28
2015-06-09git-completion.tcsh: fix redirect with noclobberLibravatar Ariel Faigon1-1/+1
2015-06-08am --abort: keep unrelated commits on unborn branchLibravatar Paul Tan2-1/+12
2015-06-08am --abort: support aborting to unborn branchLibravatar Paul Tan2-1/+25
2015-06-08am --abort: revert changes introduced by failed 3way mergeLibravatar Paul Tan2-1/+28
2015-06-08am --skip: support skipping while on unborn branchLibravatar Paul Tan2-3/+11
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