summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-2718-32/+188
|\
| * fsck: detect null sha1 in tree entriesJeff King2012-07-292-1/+33
| * do not write null sha1s to on-disk indexJeff King2012-07-292-0/+21
| * diff: do not use null sha1 as a sentinel valueJeff King2012-07-2914-32/+135
* | Merge branch 'mm/push-default-switch-warning'Junio C Hamano2012-08-272-3/+31
|\ \
| * | push: start warning upcoming default change for push.defaultMatthieu Moy2012-06-242-3/+31
* | | Merge branch 'maint'Junio C Hamano2012-08-245-23/+140
|\ \ \
| * \ \ Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-08-2419-48/+231
| |\ \ \
| | * | | Prepare for 1.7.11.6Junio C Hamano2012-08-242-1/+35
| | * | | Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11Junio C Hamano2012-08-241-0/+1
| | |\ \ \
| | * \ \ \ Merge branch 'jc/maint-abbrev-option-cli' into maint-1.7.11Junio C Hamano2012-08-241-0/+8
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'jc/maint-rev-list-topo-doc' into maint-1.7.11Junio C Hamano2012-08-241-7/+24
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'hv/coding-guidelines' into maint-1.7.11Junio C Hamano2012-08-241-0/+8
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'jc/tag-doc' into maint-1.7.11Junio C Hamano2012-08-247-16/+27
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'mk/test-seq' into maint-1.7.11Junio C Hamano2012-08-243-2/+23
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11Junio C Hamano2012-08-241-3/+0
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11Junio C Hamano2012-08-242-0/+2
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11Junio C Hamano2012-08-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Make the ciabot scripts completely self-configuring in the normal case.Eric S. Raymond2012-08-234-37/+72
| | * | | | | | | | | | | | Improved documentation for the ciabot scripts.Eric S. Raymond2012-08-232-2/+50
* | | | | | | | | | | | | | Kick off cycle towards 1.8.0Junio C Hamano2012-08-223-2/+46
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-08-222-118/+156
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-08-222-118/+156
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | contrib/ciabot: Get ciabot configuration from git variablesEric S. Raymond2012-08-222-118/+156
* | | | | | | | | | | | | | Merge branch 'jc/doc-git-updates'Junio C Hamano2012-08-221-28/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Documentation: update the introductory sectionJunio C Hamano2012-08-171-28/+32
* | | | | | | | | | | | | | | Merge branch 'mv/pull-r-for-rebase'Junio C Hamano2012-08-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | man: git pull -r is a short for --rebaseMiklos Vajna2012-08-171-0/+1
* | | | | | | | | | | | | | | Merge branch 'jc/maint-abbrev-option-cli'Junio C Hamano2012-08-221-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | gitcli: describe abbreviation of long optionsJunio C Hamano2012-08-161-0/+8
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'jc/maint-rev-list-topo-doc'Junio C Hamano2012-08-221-7/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | rev-list docs: clarify --topo-order descriptionJunio C Hamano2012-08-151-7/+24
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'hv/coding-guidelines'Junio C Hamano2012-08-221-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Documentation/CodingGuidelines: spell out more shell guidelinesHeiko Voigt2012-08-151-0/+8
* | | | | | | | | | | | | Merge branch 'jk/check-docs-update'Junio C Hamano2012-08-226-29/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | check-docs: get documented command list from MakefileJeff King2012-08-082-24/+5
| * | | | | | | | | | | | | check-docs: drop git-help special-caseJeff King2012-08-081-1/+0
| * | | | | | | | | | | | | check-docs: list git-gui as a commandJeff King2012-08-081-2/+1
| * | | | | | | | | | | | | check-docs: factor out command-listJeff King2012-08-081-2/+6
| * | | | | | | | | | | | | command-list: mention git-credential-* helpersJeff King2012-08-084-3/+5
| * | | | | | | | | | | | | command-list: add git-sh-i18nJeff King2012-08-081-0/+1
| * | | | | | | | | | | | | check-docs: update non-command documentation listJeff King2012-08-081-0/+3
| * | | | | | | | | | | | | check-docs: mention gitweb speciallyJeff King2012-08-081-2/+2
* | | | | | | | | | | | | | Merge branch 'jc/tag-doc'Junio C Hamano2012-08-227-16/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Documentation: do not mention .git/refs/* directoriesJunio C Hamano2012-08-067-16/+27
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'js/gitweb-path-info-unquote'Junio C Hamano2012-08-221-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFOJay Soffian2012-08-151-0/+5
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-2213-32/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | diff_setup_done(): return voidThomas Rast2012-08-0313-32/+16
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'tr/merge-recursive-flush'Junio C Hamano2012-08-221-18/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \