summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tf/commit-list-prefix'Junio C Hamano2010-12-229-35/+35
|\
| * commit: Add commit_list prefix in two function names.Thiago Farina2010-11-299-35/+35
* | Merge branch 'maint'Junio C Hamano2010-12-212-4/+4
|\ \
| * | t0050: fix printf format strings for portabilityJonathan Nieder2010-12-211-2/+2
| * | t3419-*.sh: Fix arithmetic expansion syntax errorRamsay Jones2010-12-211-2/+2
* | | Merge branch 'ks/blame-worktree-textconv-cached'Junio C Hamano2010-12-212-2/+23
|\ \ \
| * | | fill_textconv(): Don't get/put cache if sha1 is not validKirill Smelkov2010-12-192-4/+3
| * | | t/t8006: Demonstrate blame is broken when cachetextconv is onKirill Smelkov2010-12-191-0/+22
| |/ /
* | | Merge branch 'jk/t2107-now-passes'Junio C Hamano2010-12-211-1/+1
|\ \ \
| * | | t2107: mark passing test as successJeff King2010-12-191-1/+1
* | | | Merge branch 'jk/maint-decorate-01-bool'Junio C Hamano2010-12-211-5/+3
|\ \ \ \
| * | | | handle arbitrary ints in git_config_maybe_boolJeff King2010-12-191-5/+3
* | | | | Merge branch 'tc/completion-reflog'Junio C Hamano2010-12-211-1/+12
|\ \ \ \ \
| * | | | | bash completion: add basic support for git-reflogTay Ray Chuan2010-12-171-1/+12
* | | | | | Merge branch 'nd/oneline-sha1-name-from-specific-ref'Junio C Hamano2010-12-213-28/+134
|\ \ \ \ \ \
| * | | | | | get_sha1: handle special case $commit^{/}Nguyễn Thái Ngọc Duy2010-12-161-0/+7
| * | | | | | get_sha1: support $commit^{/regex} syntaxNguyễn Thái Ngọc Duy2010-12-143-11/+105
| * | | | | | get_sha1_oneline: make callers prepare the commit list to traverseNguyễn Thái Ngọc Duy2010-12-121-8/+11
| * | | | | | get_sha1_oneline: fix lifespan rule of temp_commit_buffer variableJunio C Hamano2010-12-121-11/+13
* | | | | | | Merge branch 'jn/maint-gitweb-pathinfo-fix'Junio C Hamano2010-12-211-8/+23
|\ \ \ \ \ \ \
| * | | | | | | gitweb: Fix handling of whitespace in generated linksJakub Narebski2010-12-141-8/+23
* | | | | | | | set_try_to_free_routine(NULL) means "do nothing special"Junio C Hamano2010-12-212-6/+4
* | | | | | | | completion: add missing configuration variablesMartin von Zweigbergk2010-12-201-4/+66
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-12-196-50/+52
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | gitweb: Include links to feeds in HTML header only for '200 OK' responseJakub Narebski2010-12-181-42/+47
| * | | | | | | fsck docs: remove outdated and useless diagnosticMark Lodato2010-12-181-3/+0
| * | | | | | | userdiff: fix typo in ruby and python word regexesThomas Rast2010-12-181-2/+2
| * | | | | | | trace.c: mark file-local function staticVasyl' Vavrychuk2010-12-171-1/+1
| * | | | | | | Fix typo in git-gc document.Jiang Xin2010-12-172-2/+2
* | | | | | | | t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" klugeJonathan Nieder2010-12-191-35/+49
* | | | | | | | builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.Thiago Farina2010-12-191-10/+2
* | | | | | | | builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.Thiago Farina2010-12-191-6/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Update draft release notes to 1.7.4Junio C Hamano2010-12-162-7/+43
* | | | | | | Merge branch 'maint'Junio C Hamano2010-12-162-2/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | difftool: provide basename to external toolsMichael J Gruber2010-12-162-0/+2
| * | | | | | git-difftool.txt: correct the description of $BASE and describe $MERGEDMichael J Gruber2010-12-161-2/+3
* | | | | | | Merge branch 'kb/diff-C-M-synonym'Junio C Hamano2010-12-162-10/+10
|\ \ \ \ \ \ \
| * | | | | | | diff: use "find" instead of "detect" as prefix for long forms of -M and -CYann Dirson2010-12-102-12/+11
| * | | | | | | diff: add --detect-copies-harder as a synonym for --find-copies-harderKevin Ballard2010-11-292-1/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'jn/fast-import-blob-access'Junio C Hamano2010-12-163-31/+447
|\ \ \ \ \ \ \
| * | | | | | | t9300: avoid short reads from ddJonathan Nieder2010-12-121-3/+3
| * | | | | | | t9300: remove unnecessary use of /dev/stdinJunio C Hamano2010-12-031-3/+3
| * | | | | | | fast-import: Allow cat-blob requests at arbitrary points in streamJonathan Nieder2010-12-013-12/+86
| * | | | | | | fast-import: let importers retrieve blobsDavid Barr2010-12-013-2/+329
| * | | | | | | fast-import: clarify documentation of "feature" commandJonathan Nieder2010-12-011-20/+17
| * | | | | | | fast-import: stricter parsing of integer optionsJonathan Nieder2010-12-012-2/+19
| |/ / / / / /
* | | | | | | Merge branch 'jl/fetch-submodule-recursive'Junio C Hamano2010-12-168-17/+387
|\ \ \ \ \ \ \
| * | | | | | | fetch_populated_submodules(): document dynamic allocationJunio C Hamano2010-12-091-1/+2
| * | | | | | | Submodules: Add the "fetchRecurseSubmodules" config optionJens Lehmann2010-11-125-3/+84
| * | | | | | | Add the 'fetch.recurseSubmodules' config settingJens Lehmann2010-11-127-9/+83