summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-05-16Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maintLibravatar Junio C Hamano1-3/+3
2011-05-16Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maintLibravatar Junio C Hamano1-2/+5
2011-05-16Merge branch 'jc/fix-add-u-unmerged' into maintLibravatar Junio C Hamano2-39/+30
2011-05-16Merge branch 'jn/gitweb-dependency' into maintLibravatar Junio C Hamano1-27/+1
2011-05-16Merge branch 'jc/maint-branch-mergeoptions' into maintLibravatar Junio C Hamano2-15/+58
2011-05-16Merge branch 'jc/maint-add-p-overlapping-hunks' into maintLibravatar Junio C Hamano3-16/+54
2011-05-16Documentation/git-fsck.txt: fix typo: unreadable -> unreachableLibravatar Jim Meyering1-2/+2
2011-05-15Update draft release notes to 1.7.5.2Libravatar Junio C Hamano1-0/+9
2011-05-15Merge branch 'cn/format-patch-quiet' into maintLibravatar Junio C Hamano2-7/+14
2011-05-15Merge branch 'jm/mergetool-submodules' into maintLibravatar Junio C Hamano2-9/+371
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-14add, merge, diff: do not use strcasecmp to compare config variable namesLibravatar Jonathan Nieder3-6/+6
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-09t1507: avoid "${parameter<op>'word'}" inside double-quotesLibravatar Junio C Hamano1-2/+5
2011-05-08t3701: add-p-fix makes the last test to passLibravatar Junio C Hamano1-1/+1
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-06merge: make branch.<name>.mergeoptions correctly override merge.<option>Libravatar Junio C Hamano2-14/+57
2011-05-05Remove duplicated "is a"Libravatar João Britto1-1/+1
2011-05-05fast-import: fix option parser for no-arg optionsLibravatar Sverre Rabbelier1-3/+3
2011-05-05t3701: fix here documentLibravatar Junio C Hamano1-3/+2
2011-05-05git-fast-import.txt: --relative-marks takes no parameterLibravatar Michael J Gruber1-2/+2
2011-05-05shell: add missing initialization of argv0_pathLibravatar Dima Sharov1-0/+2
2011-05-05t/annotate-tests: Use echo & cat instead of sedLibravatar Brian Gernhardt1-1/+2
2011-05-04Git 1.7.5.1Libravatar Junio C Hamano3-2/+36
2011-05-04Merge branch 'jh/dirstat' into maintLibravatar Junio C Hamano8-12/+81
2011-05-04Merge branch 'sp/maint-clear-postfields' into maintLibravatar Junio C Hamano1-0/+1
2011-05-04Merge branch 'jk/maint-stash-oob' into maintLibravatar Junio C Hamano2-16/+12
2011-05-04Merge branch 'jk/maint-upload-pack-shallow' into maintLibravatar Junio C Hamano1-12/+11
2011-05-04Merge branch 'dm/stash-k-i-p' into maintLibravatar Junio C Hamano3-4/+25
2011-05-04Merge branch 'jc/pack-objects-bigfile' into maintLibravatar Junio C Hamano6-9/+14
2011-05-04Merge branch 'mg/reflog-with-options' into maintLibravatar Junio C Hamano2-13/+35
2011-05-04Merge branch 'jk/stash-loosen-safety' into maintLibravatar Junio C Hamano2-7/+17
2011-05-04Merge branch 'ar/clean-rmdir-empty' into maintLibravatar Junio C Hamano2-1/+8
2011-05-04Merge branch 'mg/sha1-path-advise' into maintLibravatar Junio C Hamano2-9/+19
2011-05-04git-add.txt: document 'add.ignoreErrors'Libravatar Valentin Haenel1-0/+2
2011-05-01Pass empty file to p4merge where no base is suitable.Libravatar Ciaran Jessup1-6/+3
2011-05-01Look for password in both CVS and CVSNT password files.Libravatar Guy Rouillier1-12/+41
2011-04-29merge-one-file: fix broken merges with alternate work treesLibravatar Jeff King2-3/+8