summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \
| * | | | | | t9010 fails when no svn is availableJunio C Hamano2010-12-091-0/+6
| * | | | | | vcs-svn: fix intermittent repo_tree corruptionJonathan Nieder2010-12-071-2/+2
| * | | | | | treap: make treap_insert return inserted nodeJonathan Nieder2010-12-073-6/+18
| * | | | | | t9010 (svn-fe): Eliminate dependency on svn perl bindingsRamkumar Ramachandra2010-11-231-2/+12
* | | | | | | Merge branch 'jc/maint-svn-info-test-fix'Junio C Hamano2010-12-161-72/+34
|\ \ \ \ \ \ \
| * | | | | | | t9119: do not compare "Text Last Updated" line from "svn info"Junio C Hamano2010-12-061-72/+34
* | | | | | | | Merge branch 'jn/submodule-b-current'Junio C Hamano2010-12-162-20/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | git submodule: Remove now obsolete tests before cloning a repoJens Lehmann2010-12-062-19/+23
| * | | | | | | | git submodule -b ... of current HEAD failsJonathan Nieder2010-12-061-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'jn/maint-fast-import-object-reuse'Junio C Hamano2010-12-161-7/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fast-import: insert new object entries at start of hash bucketDavid Barr2010-11-241-7/+2
* | | | | | | | | Merge branch 'jn/fast-import-ondemand-checkpoint'Junio C Hamano2010-12-162-1/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fast-import: treat SIGUSR1 as a request to access objects earlyJonathan Nieder2010-11-242-1/+47
* | | | | | | | | | Sync with 1.7.3.4Junio C Hamano2010-12-159-18/+114
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Git 1.7.3.4v1.7.3.4Junio C Hamano2010-12-159-18/+113
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Git 1.7.2.5v1.7.2.5Junio C Hamano2010-12-159-19/+111
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Git 1.7.1.4v1.7.1.4Junio C Hamano2010-12-158-19/+104
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Git 1.7.0.9v1.7.0.9Junio C Hamano2010-12-157-19/+96
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Git 1.6.6.3v1.6.6.3Junio C Hamano2010-12-156-19/+88
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ Git 1.6.5.9v1.6.5.9Junio C Hamano2010-12-155-18/+64
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | Git 1.6.4.5v1.6.4.5Junio C Hamano2010-12-153-2/+22
| | | | | | | * | | | | | | | | | gitweb: Introduce esc_attr to escape attributes of HTML elementsJakub Narebski2010-12-151-15/+22
* | | | | | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2010-12-143-305/+1654
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | gitk: Add Brazilian Portuguese (pt-BR) translationAlexandre Erwin Ittner2010-12-141-0/+1277
| * | | | | | | | | | | | | | | | | gitk: Make text selectable on MacStefan Haller2010-12-121-0/+1
| * | | | | | | | | | | | | | | | | gitk: Prevent the text pane from becoming editableStefan Haller2010-12-121-0/+1
| * | | | | | | | | | | | | | | | | gitk: Add the equivalent of diff --color-wordsThomas Rast2010-12-121-3/+61
| * | | | | | | | | | | | | | | | | gitk: Update Swedish translation (290t)Peter Krefting2010-12-121-298/+303
| * | | | | | | | | | | | | | | | | gitk: Show notes by default (like git log does)Kirill Smelkov2010-05-301-4/+11
* | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-12-143-5/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |