summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/doc-git-updates' into maintJunio C Hamano2012-09-111-28/+32
|\
| * Documentation: update the introductory sectionJunio C Hamano2012-08-171-28/+32
* | Merge branch 'jk/check-docs-update' into maintJunio C Hamano2012-09-116-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/test-prereq' into maintJunio C Hamano2012-09-116-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
* | | | Start preparing for 1.7.12.1Junio C Hamano2012-09-102-1/+63
* | | | Merge branch 'bc/prune-info' into maintJunio C Hamano2012-09-101-1/+2
|\ \ \ \
| * | | | prune.c: only print informational message in show_only or verbose modeBrandon Casey2012-08-071-1/+2
* | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-1027-43/+288
|\ \ \ \ \
| * | | | | Almost 1.7.11.6Junio C Hamano2012-09-101-1/+29
| * | | | | Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11Junio C Hamano2012-09-101-2/+1
| |\ \ \ \ \
| | * | | | | rebase -i: use full onto sha1 in reflogMichael J Gruber2012-08-101-2/+1
| * | | | | | Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11Junio C Hamano2012-09-101-0/+4
| |\ \ \ \ \ \
| | * | | | | | sh-setup: protect from exported IFSJunio C Hamano2012-08-081-0/+4
| * | | | | | | Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11Junio C Hamano2012-09-102-1/+37
| |\ \ \ \ \ \ \
| | * | | | | | | receive-pack: do not leak output from auto-gc to standard outputJunio C Hamano2012-08-062-2/+3
| | * | | | | | | t/t5400: demonstrate breakage caused by informational message from pruneBrandon Casey2012-08-061-0/+35
| | |/ / / / / /
| * | | | | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-1018-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 'tr/maint-send-email-2047' into maint-1.7.11Junio C Hamano2012-09-102-4/+19
| |\ \ \ \ \ \ \
| | * | | | | | | send-email: improve RFC2047 quote parsingThomas Rast2012-07-312-4/+19
| | |/ / / / / /
| * | | | | | | Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11Junio C Hamano2012-09-101-3/+5
| |\ \ \ \ \ \ \
| | * | | | | | | setup: clarify error messages for file/revisions ambiguityMatthieu Moy2012-08-031-3/+5
| * | | | | | | | Merge branch 'js/gitweb-path-info-unquote' into maint-1.7.11Junio C Hamano2012-09-101-0/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFOJay Soffian2012-08-151-0/+5
| | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | 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
| |\ \ \ \ \ \ \ \
| | * | | | | | | | man: git pull -r is a short for --rebaseMiklos Vajna2012-08-171-0/+1
| | |/ / / / / / /
| * | | | | | | | Merge branch 'jc/maint-abbrev-option-cli' into maint-1.7.11Junio C Hamano2012-08-241-0/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | gitcli: describe abbreviation of long optionsJunio C Hamano2012-08-161-0/+8
| | |/ / / / / / /
| * | | | | | | | Merge branch 'jc/maint-rev-list-topo-doc' into maint-1.7.11Junio C Hamano2012-08-241-7/+24
| |\ \ \ \ \ \ \ \
| | * | | | | | | | rev-list docs: clarify --topo-order descriptionJunio C Hamano2012-08-151-7/+24
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'hv/coding-guidelines' into maint-1.7.11Junio C Hamano2012-08-241-0/+8
| |\ \ \ \ \ \ \ \