summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-08-19mergetools/meld: Use '--output' when availableLibravatar David Aguilar1-1/+24
2011-08-19mergetool--lib: Refactor tools into separate filesLibravatar David Aguilar17-333/+369
2011-08-19mergetool--lib: Make style consistent with gitLibravatar David Aguilar1-53/+100
2011-08-19difftool--helper: Make style consistent with gitLibravatar David Aguilar1-6/+12
2011-08-18Update draft release notes to 1.7.7Libravatar Junio C Hamano1-0/+6
2011-08-18Merge branch 'db/am-skip-blank-at-the-beginning'Libravatar Junio C Hamano2-3/+26
2011-08-18Merge branch 'ma/am-exclude'Libravatar Junio C Hamano2-2/+5
2011-08-18Merge branch 'maint'Libravatar Junio C Hamano1-0/+2
2011-08-18fetch-pack: check for valid commit from serverLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2011-08-17Update draft release notes to 1.7.7Libravatar Junio C Hamano1-1/+34
2011-08-17Merge branch 'mh/check-attr-relative'Libravatar Junio C Hamano14-115/+322
2011-08-17Merge branch 'js/bisect-no-checkout'Libravatar Junio C Hamano7-178/+430
2011-08-17Merge branch 'rc/histogram-diff'Libravatar Junio C Hamano14-285/+655
2011-08-17Merge branch 'jc/maint-smart-http-race-upload-pack'Libravatar Junio C Hamano1-9/+98
2011-08-17Merge branch 'js/sh-style'Libravatar Junio C Hamano4-12/+12
2011-08-17Merge branch 'js/ref-namespaces'Libravatar Junio C Hamano15-24/+326
2011-08-17Merge branch 'cb/maint-quiet-push'Libravatar Junio C Hamano6-10/+39
2011-08-17Merge branch 'jc/maint-combined-diff-work-tree'Libravatar Junio C Hamano1-4/+10
2011-08-17Merge branch 'cb/maint-exec-error-report'Libravatar Junio C Hamano3-17/+33
2011-08-17Merge branch 'maint'Libravatar Junio C Hamano1-32/+0
2011-08-17doc/fast-import: document feature import-marks-if-existsLibravatar Dmitry Ivankov2-3/+54
2011-08-17checkout-index: remove obsolete commentLibravatar Nguyễn Thái Ngọc Duy1-32/+0
2011-08-16Sync with "maint"Libravatar Junio C Hamano1-49/+1
2011-08-16Merge branch 'maint'Libravatar Junio C Hamano2-0/+54
2011-08-16merge-recursive: take advantage of hardcoded empty treeLibravatar Jonathan Nieder1-5/+3
2011-08-16Prepare for 1.7.6.1Libravatar Junio C Hamano2-1/+53
2011-08-16Merge branch 'jk/tag-list-multiple-patterns' into maintLibravatar Junio C Hamano3-12/+28
2011-08-16Merge branch 'jl/submodule-update-quiet' into maintLibravatar Junio C Hamano2-4/+11
2011-08-16Merge branch 'jl/submodule-add-relurl-wo-upstream' into maintLibravatar Junio C Hamano3-11/+15
2011-08-16Merge branch 'oa/pull-reflog' into maintLibravatar Junio C Hamano1-1/+1
2011-08-16Merge branch 'js/ls-tree-error' into maintLibravatar Junio C Hamano2-3/+25
2011-08-16Merge branch 'jk/fast-export-quote-path' into maintLibravatar Junio C Hamano2-8/+51
2011-08-16Merge branch 'jc/checkout-reflog-fix' into maintLibravatar Junio C Hamano1-2/+5
2011-08-16Merge branch 'jc/maint-reset-unmerged-path' into maintLibravatar Junio C Hamano3-2/+18
2011-08-16Merge branch 'mz/doc-rebase-abort' into maintLibravatar Junio C Hamano2-7/+11
2011-08-16Merge branch 'bw/log-all-ref-updates-doc' into maintLibravatar Junio C Hamano2-3/+6
2011-08-16Merge branch 'js/maint-add-path-stat-pwd' into maintLibravatar Junio C Hamano1-1/+2
2011-08-16Merge branch 'ms/help-unknown' into maintLibravatar Junio C Hamano1-0/+12
2011-08-16Merge branch 'mz/doc-synopsis-verse' into maintLibravatar Junio C Hamano93-6/+92
2011-08-16Merge branch 'jn/mime-type-with-params' into maintLibravatar Junio C Hamano1-1/+10
2011-08-16Merge branch 'jc/submodule-sync-no-auto-vivify' into maintLibravatar Junio C Hamano3-30/+47
2011-08-16Merge branch 'jc/zlib-wrap' into maintLibravatar Junio C Hamano15-124/+321
2011-08-16Merge branch 'fk/relink-upon-ldflags-update' into maintLibravatar Junio C Hamano2-8/+18
2011-08-16Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maintLibravatar Junio C Hamano2-1/+23
2011-08-16Merge branch 'aw/rebase-i-p' into maintLibravatar Junio C Hamano4-5/+30
2011-08-16Merge branch 'jc/diff-index-quick-exit-early' into maintLibravatar Junio C Hamano3-2/+10
2011-08-16Merge branch 'jk/combine-diff-binary-etc' into maintLibravatar Junio C Hamano5-83/+376
2011-08-16am: refresh the index at start and --resolvedLibravatar Jeff King1-0/+2
2011-08-16revert: plug memory leak in "cherry-pick root commit" codepathLibravatar Jonathan Nieder2-7/+27
2011-08-11ls-files: fix pathspec display on errorLibravatar Clemens Buchacher6-10/+88