summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-09-14Merge branch 'rj/test-regex' into maint-1.7.11Libravatar Junio C Hamano4-0/+27
2012-09-14Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11Libravatar Junio C Hamano1-8/+9
2012-09-14Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11Libravatar Junio C Hamano2-1/+30
2012-09-14log: document use of multiple commit limiting optionsLibravatar Junio C Hamano1-5/+18
2012-09-14log --grep/--author: honor --all-match honored for multiple --grep patternsLibravatar Junio C Hamano1-0/+19
2012-09-14grep: show --debug output only onceLibravatar Michael J Gruber1-0/+1
2012-09-14grep: teach --debug option to dump the parse treeLibravatar Junio C Hamano4-2/+96
2012-09-14Revert diffstat back to EnglishLibravatar Nguyễn Thái Ngọc Duy1-6/+4
2012-09-13attr: failure to open a .gitattributes file is OK with ENOTDIRLibravatar Junio C Hamano1-1/+1
2012-09-13Documentation: describe subject more preciselyLibravatar Jeremy White7-22/+31
2012-09-12Further merging in preparation for 1.7.12.1Libravatar Junio C Hamano1-0/+26
2012-09-12Merge branch 'maint-1.7.11' into maintLibravatar Junio C Hamano19-162/+321
2012-09-12Merge branch 'jc/apply-binary-p0' into maint-1.7.11Libravatar Junio C Hamano2-46/+76
2012-09-12Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Libravatar Junio C Hamano5-4/+56
2012-09-12Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1....Libravatar Junio C Hamano1-3/+3
2012-09-12Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11Libravatar Junio C Hamano9-106/+171
2012-09-12Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11Libravatar Junio C Hamano2-1/+13
2012-09-12ll-merge: warn about inability to merge binary files only when we can'tLibravatar Junio C Hamano1-3/+4
2012-09-11blame: allow "blame file" in the middle of a conflicted mergeLibravatar Junio C Hamano2-25/+70
2012-09-11Further merging down for 1.7.12.1Libravatar Junio C Hamano1-0/+13
2012-09-11Sync with 1.7.11.6Libravatar Junio C Hamano32-392/+569
2012-09-11Merge branch 'js/use-sc-open-max' into maintLibravatar Junio C Hamano1-7/+19
2012-09-11Merge branch 'js/no-curl-easy-strerror-on-old-curl' into maintLibravatar Junio C Hamano1-0/+2
2012-09-11Git 1.7.11.6Libravatar Junio C Hamano3-35/+58
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 'rr/precompose-utf8-cleanup' into maintLibravatar Junio C Hamano1-25/+19
2012-09-11Merge branch 'jc/capabilities' into maintLibravatar Junio C Hamano8-17/+102
2012-09-11Merge branch 'jc/doc-git-updates' into maintLibravatar Junio C Hamano1-28/+32
2012-09-11Merge branch 'jk/check-docs-update' into maintLibravatar Junio C Hamano6-29/+18
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-11Merge branch 'jc/test-prereq' into maintLibravatar Junio C Hamano6-205/+233
2012-09-11run-command.c: fix broken list iteration in clear_child_for_cleanupLibravatar David Gould1-6/+7
2012-09-10blame $path: avoid getting fooled by case insensitive filesystemsLibravatar Junio C Hamano2-4/+16
2012-09-10Start preparing for 1.7.12.1Libravatar Junio C Hamano2-1/+63
2012-09-10Merge branch 'bc/prune-info' into maintLibravatar Junio C Hamano1-1/+2
2012-09-10Merge branch 'maint-1.7.11' into maintLibravatar Junio C Hamano27-43/+288
2012-09-10Almost 1.7.11.6Libravatar Junio C Hamano1-1/+29