summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-05-13Merge branch 'cn/log-parse-opt'Libravatar Junio C Hamano1-30/+44
2011-05-13Merge branch 'maint'Libravatar Junio C Hamano2-2/+35
2011-05-13Prepare for 1.7.5.2Libravatar Junio C Hamano2-1/+34
2011-05-13Merge branch 'aw/maint-rebase-i-p-no-ff' into maintLibravatar Junio C Hamano2-2/+32
2011-05-13Merge branch 'js/blame-parsename' into maintLibravatar Junio C Hamano3-3/+14
2011-05-13Merge branch 'gr/cvsimport-alternative-cvspass-location' into maintLibravatar Junio C Hamano1-12/+41
2011-05-13Merge branch 'cj/p4merge' into maintLibravatar Junio C Hamano1-6/+3
2011-05-13Merge branch 'jk/merge-one-file-working-tree' into maintLibravatar Junio C Hamano2-1/+106
2011-05-13Merge branch 'jc/fix-diff-files-unmerged' into maintLibravatar Junio C Hamano16-36/+120
2011-05-13Merge branch 'mz/maint-rename-unmerged' into maintLibravatar Junio C Hamano2-2/+67
2011-05-13t5400: Fix a couple of typosLibravatar Johan Herland1-2/+2
2011-05-12Merge branch 'nd/struct-pathspec'Libravatar Junio C Hamano1-7/+7
2011-05-12Tweak t3102-ls-tree-wildcards to run on WindowsLibravatar Johannes Sixt1-7/+7
2011-05-11Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Libravatar Junio C Hamano2-52/+45
2011-05-11Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Libravatar Junio C Hamano2-52/+45
2011-05-11setup_revisions(): take pathspec from command line and --stdin correctlyLibravatar Junio C Hamano2-52/+45
2011-05-11Update draft release notes to 1.7.6Libravatar Junio C Hamano1-3/+18
2011-05-11Merge branch 'jn/gitweb-dependency'Libravatar Junio C Hamano1-27/+1
2011-05-11Merge branch 'jc/maint-branch-mergeoptions'Libravatar Junio C Hamano2-15/+58
2011-05-11Merge branch 'jn/maint-test-merge-verify-parents'Libravatar Junio C Hamano2-99/+98
2011-05-11Merge branch 'vh/config-interactive-singlekey-doc'Libravatar Junio C Hamano5-13/+21
2011-05-11Merge branch 'jc/maint-add-p-overlapping-hunks'Libravatar Junio C Hamano3-16/+54
2011-05-11Merge branch 'sr/maint-fast-import-tighten-option-parsing'Libravatar Junio C Hamano1-3/+3
2011-05-11Merge branch 'dm/http-cleanup'Libravatar Junio C Hamano6-114/+80
2011-05-11Merge branch 'jn/ctags'Libravatar Junio C Hamano3-121/+399
2011-05-11Do not strip empty lines / trailing spaces from a commit message templateLibravatar Boris Faure3-1/+25
2011-05-10Merge branch 'fc/completion-zsh' into sg/completion-updatesLibravatar Junio C Hamano1-0/+8
2011-05-10Revert "completion: don't declare 'local words' to make zsh happy"Libravatar Junio C Hamano1-6/+2
2011-05-10git-completion: fix regression in zsh supportLibravatar Felipe Contreras1-0/+8
2011-05-10Test atomic git-commit --interactiveLibravatar Conrad Irwin1-0/+10
2011-05-09Add commit to list of config.singlekey commandsLibravatar Conrad Irwin1-3/+4
2011-05-09Add support for -p/--patch to git-commitLibravatar Conrad Irwin4-16/+27
2011-05-09Allow git commit --interactive with pathsLibravatar Conrad Irwin2-4/+3
2011-05-09t7501.8: feed a meaningful commandLibravatar Jeff King1-4/+6
2011-05-09Honor $(prefix) set in config.mak* when defining ETC_GIT*Libravatar Johannes Sixt1-9/+9
2011-05-09Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconf...Libravatar Junio C Hamano1-10/+9
2011-05-09convert: make it harder to screw up adding a conversion attributeLibravatar Junio C Hamano1-41/+38
2011-05-09convert: make it safer to add conversion attributesLibravatar Junio C Hamano1-26/+22
2011-05-09convert: give saner names to crlf/eol variables, types and functionsLibravatar Junio C Hamano1-30/+31
2011-05-09convert: rename the "eol" global variable to "core_eol"Libravatar Junio C Hamano4-10/+10
2011-05-09t1507: avoid "${parameter<op>'word'}" inside double-quotesLibravatar Junio C Hamano1-2/+5
2011-05-08completion: move private shopt shim for zsh to __git_ namespaceLibravatar Jonathan Nieder1-4/+8
2011-05-08t3701: add-p-fix makes the last test to passLibravatar Junio C Hamano1-1/+1
2011-05-08rerere: libify rerere_clear() and rerere_gc()Libravatar Junio C Hamano3-75/+88
2011-05-08Use a temporary index for git commit --interactiveLibravatar Conrad Irwin2-9/+30
2011-05-08Remove gitweb/gitweb.cgi and other legacy targets from main MakefileLibravatar Jakub Narebski1-26/+0
2011-05-08git-instaweb: Simplify build dependency on gitwebLibravatar Jakub Narebski1-1/+1
2011-05-06tests: check git does not barf on merge.ff values for future versions of gitLibravatar Jonathan Nieder1-2/+14
2011-05-06tests: teach verify_parents to check for extra parentsLibravatar Jonathan Nieder1-0/+1
2011-05-06merge: introduce merge.ff configuration variableLibravatar Junio C Hamano3-2/+60