summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-16Merge branch 'nd/slim-index-pack-memory-usage'Libravatar Junio C Hamano1-2/+6
2015-06-16Merge branch 'sb/pack-protocol-mention-smart-http'Libravatar Junio C Hamano1-3/+3
2015-06-16Merge branch 'jk/make-fix-dependencies'Libravatar Junio C Hamano1-24/+25
2015-06-16Merge branch 'jk/die-on-bogus-worktree-late'Libravatar Junio C Hamano2-10/+26
2015-06-16Merge branch 'sg/merge-summary-config'Libravatar Junio C Hamano3-16/+12
2015-06-16Merge branch 'ah/send-email-sendmail-alias'Libravatar Junio C Hamano3-2/+70
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-11Second half of seventh batchLibravatar Junio C Hamano1-0/+28
2015-06-11Merge branch 'tb/complete-sequencing'Libravatar Junio C Hamano1-0/+5
2015-06-11Merge branch 'jk/squelch-missing-link-warning-for-unreachable'Libravatar Junio C Hamano7-9/+34
2015-06-11Merge branch 'pt/pull-tests'Libravatar Junio C Hamano2-36/+175
2015-06-11Merge branch 'sb/glossary-submodule'Libravatar Junio C Hamano1-0/+16
2015-06-11Merge branch 'sb/submodule-doc-intro'Libravatar Junio C Hamano1-28/+22
2015-06-11Merge branch 'jk/diagnose-config-mmap-failure'Libravatar Junio C Hamano4-11/+29
2015-06-11Merge branch 'mt/p4-depotFile-at-version'Libravatar Junio C Hamano1-1/+1
2015-06-11Merge branch 'mh/verify-lock-error-report'Libravatar Junio C Hamano2-21/+33
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Libravatar Junio C Hamano5-23/+24
2015-06-11Merge branch 'jk/clone-dissociate'Libravatar Junio C Hamano1-13/+4
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Libravatar Junio C Hamano4-260/+385
2015-06-10doc: format-patch: fix typoLibravatar Frans Klaver1-1/+1
2015-06-10git-p4: fixing --changes-block-size handlingLibravatar Luke Diamand2-28/+69
2015-06-10git-p4: add tests for non-numeric revision rangeLibravatar Luke Diamand1-0/+38
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