summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | fetch/pull: Add the --recurse-submodules optionJens Lehmann2010-11-126-17/+231
* | | | Merge branch 'rj/msvc-fix'Junio C Hamano2010-12-164-7/+8
|\ \ \ \
| * | | | msvc: Fix macro redefinition warningsRamsay Jones2010-12-091-6/+0
| * | | | msvc: Fix build by adding missing INTMAX_MAX defineRamsay Jones2010-12-091-0/+4
| * | | | msvc: git-daemon.exe: Fix linker "unresolved externals" errorRamsay Jones2010-12-091-1/+1
| * | | | msvc: Fix compilation errors in compat/win32/sys/poll.cRamsay Jones2010-12-091-0/+3
* | | | | Merge branch 'nd/extended-sha1-relpath'Junio C Hamano2010-12-165-4/+127
|\ \ \ \ \
| * | | | | get_sha1: teach ":$n:<path>" the same relative path logicJunio C Hamano2010-12-092-6/+32
| * | | | | get_sha1: support relative path ":path" syntaxNguyễn Thái Ngọc Duy2010-12-073-3/+100
| * | | | | Make prefix_path() return char* without constNguyễn Thái Ngọc Duy2010-12-072-2/+2
* | | | | | Merge branch 'aa/status-hilite-branch'Junio C Hamano2010-12-167-9/+31
|\ \ \ \ \ \
| * | | | | | default color.status.branch to "same as header"Jeff King2010-12-103-2/+15
| * | | | | | status: show branchname with a configurable colorAleksi Aalto2010-11-295-8/+17
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ak/describe-exact'Junio C Hamano2010-12-161-25/+60
|\ \ \ \ \ \
| * | | | | | describe: Delay looking up commits until searching for an inexact matchAnders Kaseorg2010-12-091-15/+22
| * | | | | | describe: Store commit_names in a hash table by commit SHA1Anders Kaseorg2010-12-091-5/+33
| * | | | | | describe: Do not use a flex array in struct commit_nameAnders Kaseorg2010-12-091-6/+6
| * | | | | | describe: Use for_each_rawrefAnders Kaseorg2010-12-091-1/+1
* | | | | | | Merge branch 'nd/maint-relative'Junio C Hamano2010-12-161-0/+6
|\ \ \ \ \ \ \
| * | | | | | | get_cwd_relative(): do not misinterpret root pathNguyễn Thái Ngọc Duy2010-11-231-0/+6
* | | | | | | | Merge branch 'jn/maint-svn-fe'Junio C Hamano2010-12-165-10/+38
|\ \ \ \ \ \ \ \