summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-02-201-24/+40
* | | | | | | | | | | | | | | | | | | | Merge branch 'tg/tag-points-at'Junio C Hamano2012-02-203-2/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | builtin/tag.c: Fix a sparse warningtg/tag-points-atRamsay Jones2012-02-131-1/+1
| * | | | | | | | | | | | | | | | | | | | tag: add --points-at list optionTom Grennan2012-02-083-2/+93
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-stat-scaler'Junio C Hamano2012-02-201-7/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | diff --stat: show bars of same length for paths with same amount of changesjc/diff-stat-scalerJunio C Hamano2012-02-141-7/+20
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj/decimal-width'Junio C Hamano2012-02-203-15/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | make lineno_width() from blame reusable for otherszj/decimal-widthZbigniew Jędrzejewski-Szmek2012-02-143-15/+16
* | | | | | | | | | | | | | | | | | | | | Merge branch 'zj/term-columns'Junio C Hamano2012-02-203-22/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | pager: find out the terminal width before spawning the pagerzj/term-columnsZbigniew Jędrzejewski-Szmek2012-02-133-22/+38
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'cb/transfer-no-progress'Junio C Hamano2012-02-207-21/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | push/fetch/clone --no-progress suppresses progress outputcb/transfer-no-progressClemens Buchacher2012-02-137-21/+28
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'cb/receive-pack-keep-errors'Junio C Hamano2012-02-202-11/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | do not override receive-pack errorscb/receive-pack-keep-errorsClemens Buchacher2012-02-132-11/+35
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'cb/maint-t5541-make-server-port-portable'Junio C Hamano2012-02-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | t5541: check error message against the real port number usedcb/maint-t5541-make-server-port-portableClemens Buchacher2012-02-131-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'cb/maint-rev-list-verify-object'Junio C Hamano2012-02-202-2/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | git rev-list: fix invalid typecastcb/maint-rev-list-verify-objectClemens Buchacher2012-02-132-2/+28
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-02-203-1/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Update draft release notes to 1.7.9.2Junio C Hamano2012-02-201-0/+3
| * | | | | | | | | | | | | | | | gitweb: Fix 'grep' search for multiple matches in fileJakub Narebski2012-02-192-1/+41
* | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2012-02-163-4/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update draft release notes to 1.7.9.2Junio C Hamano2012-02-162-1/+28
| * | | | | | | | | | | | | | | Merge branch 'jc/checkout-out-of-unborn' into maintJunio C Hamano2012-02-162-1/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-mailmap-output' into maintJunio C Hamano2012-02-161-8/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/prompt-fallback-to-tty' into maintJunio C Hamano2012-02-161-9/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/gitweb-search-utf-8' into maintJunio C Hamano2012-02-161-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-commit-ignore-i-t-a' into maintJunio C Hamano2012-02-162-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/empty-loose-error-message' into maintJunio C Hamano2012-02-161-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nk/ctype-for-perf' into maintJunio C Hamano2012-02-162-1/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jx/i18n-more-marking' into maintJunio C Hamano2012-02-162-14/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | man: rearrange git synopsis to fit in 80 linesZbigniew Jędrzejewski-Szmek2012-02-161-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | completion: --list option for git-branchRalf Thielow2012-02-161-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rt/completion-branch-edit-desc' into maintJunio C Hamano2012-02-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/git-dir-lookup'Junio C Hamano2012-02-145-5/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | standardize and improve lookup rules for external local reposjk/git-dir-lookupJeff King2012-02-025-5/+109
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/grep-binary-attribute'Junio C Hamano2012-02-145-192/+308
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | grep: pre-load userdiff drivers when threadedjk/grep-binary-attributeJeff King2012-02-021-4/+6
| * | | | | | | | | | | | | | | | | | | | | | | grep: load file data after checking binary-nessJeff King2012-02-021-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | grep: respect diff attributes for binary-nessJeff King2012-02-023-2/+39
| * | | | | | | | | | | | | | | | | | | | | | | grep: cache userdiff_driver in grep_sourceJeff King2012-02-022-6/+20
| * | | | | | | | | | | | | | | | | | | | | | | grep: drop grep_buffer's "name" parameterJeff King2012-02-023-4/+3
| * | | | | | | | | | | | | | | | | | | | | | | convert git-grep to use grep_source interfaceJeff King2012-02-021-119/+23
| * | | | | | | | | | | | | | | | | | | | | | | grep: refactor the concept of "grep source" into an objectJeff King2012-02-022-34/+186
| * | | | | | | | | | | | | | | | | | | | | | | grep: move sha1-reading mutex into low-level codeJeff King2012-02-023-23/+29
| * | | | | | | | | | | | | | | | | | | | | | | grep: make locking flag globalJeff King2012-02-023-11/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/pack-objects-parseopt'Junio C Hamano2012-02-143-190/+148
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | pack-objects: convert to use parse_options()nd/pack-objects-parseoptNguyễn Thái Ngọc Duy2012-02-011-176/+139
| * | | | | | | | | | | | | | | | | | | | | | | pack-objects: remove bogus commentNguyễn Thái Ngọc Duy2012-02-012-14/+5
| * | | | | | | | | | | | | | | | | | | | | | | pack-objects: do not accept "--index-version=version,"Nguyễn Thái Ngọc Duy2012-02-012-1/+5
| |/ / / / / / / / / / / / / / / / / / / / / /