summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-05-15Merge branch 'jk/format-patch-quote-special-in-from' into maintLibravatar Junio C Hamano2-1/+102
2011-05-15Merge branch 'vh/git-svn-doc' into maintLibravatar Junio C Hamano1-11/+11
2011-05-15git_open_noatime(): drop unused parameterLibravatar Junio C Hamano1-8/+7
2011-05-15sha1_file: typofixLibravatar Junio C Hamano1-1/+1
2011-05-15read_sha1_file(): allow selective bypassing of replacement mechanismLibravatar Junio C Hamano2-5/+12
2011-05-15inline lookup_replace_object() callsLibravatar Junio C Hamano3-4/+14
2011-05-15read_sha1_file(): get rid of read_sha1_file_repl() madnessLibravatar Junio C Hamano4-17/+9
2011-05-15t6050: make sure we test not just commit replacementLibravatar Junio C Hamano1-2/+16
2011-05-15Declare lookup_replace_object() in cache.h, not in commit.hLibravatar Junio C Hamano2-2/+1
2011-05-14Merge branch 'maint'Libravatar Junio C Hamano3-6/+6
2011-05-14add, merge, diff: do not use strcasecmp to compare config variable namesLibravatar Jonathan Nieder3-6/+6
2011-05-14Submodules: Don't parse .gitmodules when it contains, merge conflictsLibravatar Jens Lehmann2-5/+32
2011-05-14test that git status works with merge conflict in, .gitmodulesLibravatar Heiko Voigt1-4/+88
2011-05-13git-p4: warn if git authorship won't be retainedLibravatar Luke Diamand3-2/+79
2011-05-13Update draft release notes to 1.7.6Libravatar Junio C Hamano1-30/+16
2011-05-13Merge branch 'bf/commit-template-no-cleanup'Libravatar Junio C Hamano3-1/+25
2011-05-13Merge branch 'jc/t1506-shell-param-expansion-gotcha'Libravatar Junio C Hamano1-2/+5
2011-05-13Merge branch 'rr/rerere-libify-clear-gc'Libravatar Junio C Hamano3-75/+88
2011-05-13Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Libravatar Junio C Hamano1-0/+5
2011-05-13Merge branch 'jh/dirstat-lines'Libravatar Junio C Hamano5-32/+1219
2011-05-13Merge branch 'jc/fix-add-u-unmerged'Libravatar Junio C Hamano2-39/+30
2011-05-13Merge branch 'jn/setup-revisions-glob-and-friends-passthru'Libravatar Junio C Hamano2-65/+122
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/+44
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