summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-10-12Teach merge the '[-e|--edit]' optionLibravatar Jay Soffian3-39/+99
2011-09-30Git 1.7.7Libravatar Junio C Hamano3-10/+6
2011-09-27templates/hooks--*: remove sample hooks without any functionalityLibravatar Gerrit Pape2-23/+0
2011-09-26contrib/hooks: adapt comment about Debian install location for contrib hooksLibravatar Gerrit Pape1-2/+2
2011-09-26Merge branch 'jc/namespace-doc-with-old-asciidoc'Libravatar Junio C Hamano1-0/+7
2011-09-23Git 1.7.7-rc3Libravatar Junio C Hamano2-31/+2
2011-09-23Merge 1.7.6.4 inLibravatar Junio C Hamano2-1/+34
2011-09-23merge-recursive: Do not look at working tree during a virtual ancestor mergeLibravatar Junio C Hamano1-1/+1
2011-09-23Git 1.7.6.4Libravatar Junio C Hamano4-3/+36
2011-09-23Merge branch 'cb/maint-ls-files-error-report' into maintLibravatar Junio C Hamano6-10/+90
2011-09-23describe: Refresh the index when run with --dirtyLibravatar Allan Caffee1-2/+15
2011-09-23Merge branch 'jc/maint-clone-alternates' into maintLibravatar Junio C Hamano3-30/+114
2011-09-23Merge branch 'nd/maint-clone-gitdir' into maintLibravatar Junio C Hamano9-12/+33
2011-09-23Merge branch 'mh/check-ref-format-print-normalize' into maintLibravatar Junio C Hamano3-4/+13
2011-09-23Merge branch 'mg/branch-set-upstream-previous' into maintLibravatar Junio C Hamano2-1/+15
2011-09-23Merge branch 'gb/maint-am-patch-format-error-message' into maintLibravatar Junio C Hamano1-1/+2
2011-09-19Merge branch 'maint'Libravatar Junio C Hamano2-2/+2
2011-09-19git-mergetool: check return value from readLibravatar Jay Soffian2-2/+2
2011-09-19Merge branch 'ph/format-patch-no-color'Libravatar Junio C Hamano1-4/+4
2011-09-19t4014: clean up format.thread config after each testLibravatar Jeff King1-4/+4
2011-09-18Git 1.7.7-rc2Libravatar Junio C Hamano2-2/+2
2011-09-16Merge branch 'ci/forbid-unwanted-current-branch-update'Libravatar Junio C Hamano5-12/+39
2011-09-16branch --set-upstream: regression fixLibravatar Junio C Hamano5-12/+39
2011-09-16Disambiguate duplicate t9160* testsLibravatar Frédéric Heitzmann2-1/+1
2011-09-16Documentation/gitnamespaces.txt: cater to older asciidocLibravatar Junio C Hamano1-0/+7
2011-09-14Merge branch 'ph/format-patch-no-color'Libravatar Junio C Hamano2-1/+10
2011-09-13git-svn: teach git-svn to populate svn:mergeinfoLibravatar Bryan Jacobs4-0/+742
2011-09-12format-patch: ignore ui.colorLibravatar Pang Yan Han2-1/+10
2011-09-12Git 1.7.7-rc1Libravatar Junio C Hamano1-1/+1
2011-09-12Sync with 1.7.6.3Libravatar Junio C Hamano4-7/+19
2011-09-12Merge branch 'jn/remote-helpers-doc'Libravatar Junio C Hamano3-31/+195
2011-09-12Git 1.7.6.3Libravatar Junio C Hamano3-2/+7
2011-09-12Merge branch 'jl/maint-fetch-submodule-check-fix' into maintLibravatar Junio C Hamano2-6/+13
2011-09-11Merge branch 'maint'Libravatar Junio C Hamano2-2/+21
2011-09-11Prepare for 1.7.6.3 maintenance releaseLibravatar Junio C Hamano2-1/+21
2011-09-11Merge branch 'ms/reflog-show-is-default' into maintLibravatar Junio C Hamano1-2/+1
2011-09-11Merge branch 'jk/reset-reflog-message-fix' into maintLibravatar Junio C Hamano2-37/+20
2011-09-11Merge branch 'vi/make-test-vector-less-specific' into maintLibravatar Junio C Hamano8-13/+13
2011-09-11Merge branch 'jk/tag-contains-ab' (early part) into maintLibravatar Junio C Hamano1-1/+45
2011-09-11Merge branch 'dz/connect-error-report' into maintLibravatar Junio C Hamano1-14/+11
2011-09-11Merge branch 'jc/maint-mergetool-read-fix' into maintLibravatar Junio C Hamano1-4/+4
2011-09-11Merge branch 'jk/maint-config-param' into maintLibravatar Junio C Hamano4-11/+47
2011-09-11Merge branch 'jn/doc-dashdash' into maintLibravatar Junio C Hamano9-13/+13
2011-09-11Merge branch 'jk/maint-1.7.2-status-ignored' into maintLibravatar Junio C Hamano3-2/+128
2011-09-11SubmittingPathces: remove Cogito referenceLibravatar Sverre Rabbelier1-2/+1
2011-09-09fetch: skip on-demand checking when no submodules are configuredLibravatar Jens Lehmann2-6/+13
2011-09-07RelNotes/1.7.7: minor fixesLibravatar Michael J Gruber1-26/+26
2011-09-07Minor update to how-to maintain gitLibravatar Junio C Hamano1-7/+6
2011-09-06Update draft release notes to 1.7.7Libravatar Junio C Hamano1-1/+6
2011-09-06Merge branch 'rc/histogram-diff'Libravatar Junio C Hamano1-0/+2