summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-09-11Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11Libravatar Junio C Hamano1-273/+308
2012-09-11Merge branch 'sz/submodule-force-update' into maint-1.7.11Libravatar Junio C Hamano3-2/+21
2012-09-11Merge branch 'ph/stash-rerere' into maint-1.7.11Libravatar Junio C Hamano2-0/+39
2012-09-11Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11Libravatar Junio C Hamano1-0/+2
2012-09-11Merge branch 'jc/maint-config-exit-status' into maint-1.7.11Libravatar Junio C Hamano3-6/+11
2012-09-11Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11Libravatar Junio C Hamano1-2/+2
2012-09-11Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11Libravatar Junio C Hamano2-7/+52
2012-09-11Merge branch 'mz/empty-rebase-test' into maint-1.7.11Libravatar Junio C Hamano1-1/+17
2012-09-11Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11Libravatar Junio C Hamano2-3/+3
2012-09-11Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Libravatar Junio C Hamano2-0/+31
2012-09-11Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11Libravatar Junio C Hamano1-8/+8
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Libravatar Junio C Hamano13-32/+16
2012-09-11Merge branch 'tr/merge-recursive-flush' into maint-1.7.11Libravatar Junio C Hamano1-18/+1
2012-09-11Merge branch 'nd/index-errno' into maint-1.7.11Libravatar Junio C Hamano1-5/+1
2012-09-11Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Libravatar Junio C Hamano1-1/+0
2012-09-10Almost 1.7.11.6Libravatar Junio C Hamano1-1/+29
2012-09-10Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11Libravatar Junio C Hamano1-2/+1
2012-09-10Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11Libravatar Junio C Hamano1-0/+4
2012-09-10Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11Libravatar Junio C Hamano2-1/+37
2012-09-10Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Libravatar Junio C Hamano18-32/+188
2012-09-10Merge branch 'tr/maint-send-email-2047' into maint-1.7.11Libravatar Junio C Hamano2-4/+19
2012-09-10Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11Libravatar Junio C Hamano1-3/+5
2012-09-10Merge branch 'js/gitweb-path-info-unquote' into maint-1.7.11Libravatar Junio C Hamano1-0/+5
2012-08-24Prepare for 1.7.11.6Libravatar Junio C Hamano2-1/+35
2012-08-24Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11Libravatar Junio C Hamano1-0/+1
2012-08-24Merge branch 'jc/maint-abbrev-option-cli' into maint-1.7.11Libravatar Junio C Hamano1-0/+8
2012-08-24Merge branch 'jc/maint-rev-list-topo-doc' into maint-1.7.11Libravatar Junio C Hamano1-7/+24
2012-08-24Merge branch 'hv/coding-guidelines' into maint-1.7.11Libravatar Junio C Hamano1-0/+8
2012-08-24Merge branch 'jc/tag-doc' into maint-1.7.11Libravatar Junio C Hamano7-16/+27
2012-08-24Merge branch 'mk/test-seq' into maint-1.7.11Libravatar Junio C Hamano3-2/+23
2012-08-24Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11Libravatar Junio C Hamano1-3/+0
2012-08-24Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11Libravatar Junio C Hamano2-0/+2
2012-08-24Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11Libravatar Junio C Hamano1-1/+1
2012-08-24Make 'git submodule update --force' always check out submodules.Libravatar Stefan Zager3-2/+21
2012-08-23mergetool: style fixesLibravatar Junio C Hamano1-273/+308
2012-08-23Make the ciabot scripts completely self-configuring in the normal case.Libravatar Eric S. Raymond4-37/+72
2012-08-23Improved documentation for the ciabot scripts.Libravatar Eric S. Raymond2-2/+50
2012-08-22contrib/ciabot: Get ciabot configuration from git variablesLibravatar Eric S. Raymond2-118/+156
2012-08-18git-config doc: unconfuse an exampleLibravatar Junio C Hamano1-1/+1
2012-08-18git-config.txt: fix exampleLibravatar Michael Haggerty1-1/+1
2012-08-17stash: invoke rerere in case of conflictLibravatar Phil Hord2-1/+2
2012-08-17test: git-stash conflict sets up rerereLibravatar Phil Hord1-0/+38
2012-08-17man: git pull -r is a short for --rebaseLibravatar Miklos Vajna1-0/+1
2012-08-16gitcli: describe abbreviation of long optionsLibravatar Junio C Hamano1-0/+8
2012-08-15Git 1.7.11.5Libravatar Junio C Hamano3-2/+11
2012-08-15Merge branch 'rj/maint-grep-remove-redundant-test' into maintLibravatar Junio C Hamano1-11/+0
2012-08-15Merge branch 'hv/link-alt-odb-entry' into maintLibravatar Junio C Hamano1-1/+1
2012-08-15rev-list docs: clarify --topo-order descriptionLibravatar Junio C Hamano1-7/+24
2012-08-15gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFOLibravatar Jay Soffian1-0/+5
2012-08-15Documentation/CodingGuidelines: spell out more shell guidelinesLibravatar Heiko Voigt1-0/+8