summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \
| * | | | | | | | merge-recursive: eliminate flush_buffer() in favor of write_in_full()Thomas Rast2012-08-031-18/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'mm/die-with-dashdash-help'Junio C Hamano2012-08-221-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | setup: clarify error messages for file/revisions ambiguityMatthieu Moy2012-08-031-3/+5
* | | | | | | | | Merge branch 'tr/maint-send-email-2047'Junio C Hamano2012-08-222-4/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | send-email: improve RFC2047 quote parsingThomas Rast2012-07-312-4/+19
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/index-errno'Junio C Hamano2012-08-221-5/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | read_index_from: remove bogus errno assignmentsNguyễn Thái Ngọc Duy2012-08-061-5/+1
* | | | | | | | | | Merge branch 'mk/test-seq'Junio C Hamano2012-08-223-2/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tests: Introduce test_seqMichał Kiedrowicz2012-08-043-2/+23
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pg/maint-apply-remove-unused-variable'Junio C Hamano2012-08-221-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply: delete unused deflate_origlen from patch structPaul Gortmaker2012-08-051-1/+0
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/test-prereq'Junio C Hamano2012-08-226-205/+233
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t3910: use the UTF8_NFD_TO_NFC test prereqMichael J Gruber2012-08-221-146/+135
| * | | | | | | | | | test-lib: provide UTF8 behaviour as a prerequisiteMichael J Gruber2012-07-273-17/+25
| * | | | | | | | | | t0050: use the SYMLINKS test prereqMichael J Gruber2012-07-271-14/+7
| * | | | | | | | | | t0050: use the CASE_INSENSITIVE_FS test prereqMichael J Gruber2012-07-271-13/+8
| * | | | | | | | | | test-lib: provide case insensitivity as a prerequisiteMichael J Gruber2012-07-273-10/+10
| * | | | | | | | | | test: allow prerequisite to be evaluated lazilyJunio C Hamano2012-07-272-3/+46
| * | | | | | | | | | test: rename $satisfied to $satisfied_prereqJunio C Hamano2012-07-271-3/+3
* | | | | | | | | | | Merge branch 'ms/git-svn-1.7'Junio C Hamano2012-08-2212-174/+489
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |