summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-05-16Merge branch 'jn/maint-format-patch-doc' into maintLibravatar Junio C Hamano1-0/+58
2011-05-16Merge branch 'ss/cherry-pick-x-doc' into maintLibravatar Junio C Hamano1-3/+4
2011-05-16Merge branch 'vr/merge-base-doc' into maintLibravatar Junio C Hamano2-14/+23
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-16send-pack: avoid deadlock on git:// push with failed pack-objectsLibravatar Jeff King1-0/+2
2011-05-16connect: let callers know if connection is a socketLibravatar Jeff King2-1/+7
2011-05-16connect: treat generic proxy processes like ssh processesLibravatar Jeff King1-13/+15
2011-05-16sideband_demux(): fix decl-after-stmtLibravatar Junio C Hamano1-2/+2
2011-05-16t3503: test cherry picking and reverting root commitsLibravatar Jeff King1-2/+25
2011-05-16revert: allow reverting a root commitLibravatar Jeff King1-3/+1
2011-05-16cherry-pick: handle root commits with external strategiesLibravatar Jeff King1-2/+10
2011-05-15Sync release notes for 1.7.6 to exclude what are in maintenance trackLibravatar Junio C Hamano1-12/+0
2011-05-15Merge branch 'maint'Libravatar Junio C Hamano2-9/+17
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-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-14Makefile: add xgettext target for *.sh filesLibravatar Ævar Arnfjörð Bjarmason1-1/+5
2011-05-14git-sh-i18n.sh: add GIT_GETTEXT_POISON supportLibravatar Ævar Arnfjörð Bjarmason1-9/+21
2011-05-14git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappersLibravatar Ævar Arnfjörð Bjarmason4-0/+61
2011-05-14git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()Libravatar Ævar Arnfjörð Bjarmason5-0/+524
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