summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into git-poJiang Xin2012-02-281-20/+68
|\
| * Merge branch 'maint'Junio C Hamano2012-02-261-0/+1
| |\
| | * Sync with 1.7.8.5Junio C Hamano2012-02-261-0/+1
| | |\
| | | * Makefile: add thread-utils.h to LIB_HDmitry V. Levin2012-02-261-0/+1
| | * | Merge branch 'dp/i18n-libcharset' into maintJunio C Hamano2012-02-211-0/+5
| | |\ \
| | * \ \ Merge branch 'tt/profile-build-fix' into maintJunio C Hamano2012-02-211-18/+37
| | |\ \ \
| | * \ \ \ Merge branch 'mp/make-cleanse-x-for-exe' into maintJunio C Hamano2012-02-131-0/+3
| | |\ \ \ \
| * | | | | | Introduce a performance testing frameworkThomas Rast2012-02-171-1/+21
| * | | | | | Merge branch 'dp/i18n-libcharset'Junio C Hamano2012-02-141-0/+5
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Makefile: introduce CHARSET_LIB to link with -lcharsetdp/i18n-libcharsetДилян Палаузов2012-02-131-0/+5
| * | | | | | Sync with maintJunio C Hamano2012-02-131-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Makefile: Change the default compiler from "gcc" to "cc"Ævar Arnfjörð Bjarmason2012-02-131-1/+1
| | |/ / / /
| * | | | | Merge branch 'tt/profile-build-fix'Junio C Hamano2012-02-121-18/+37
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Makefile: fix syntax for older makett/profile-build-fixJohannes Sixt2012-02-091-2/+4
| | * | | | Fix build problems related to profile-directed optimizationTheodore Ts'o2012-02-061-18/+35
| | |/ / /
| * | | | Merge branch 'mp/make-cleanse-x-for-exe'Junio C Hamano2012-02-121-0/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Explicitly set X to avoid potential build breakagemp/make-cleanse-x-for-exeMichael Palimaka2012-02-091-0/+3
| | | |/ | | |/|
| | * | Merge branch 'na/strtoimax' into maintJunio C Hamano2011-12-281-3/+3
| | |\ \
* | | | | l10n: initial git.pot for 1.7.10 upcoming releaseJiang Xin2012-02-151-1/+0
|/ / / /
* | | | Merge branch 'jn/svn-fe'Junio C Hamano2012-02-071-19/+40
|\ \ \ \
| * \ \ \ Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-feJunio C Hamano2012-01-271-19/+40
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'db/delta-applier' into svn-feJonathan Nieder2011-06-151-14/+41
| | |\ \ \
| | | * | | vcs-svn: skeleton of an svn delta parserJonathan Nieder2011-03-271-0/+2
| | | * | | vcs-svn: learn to maintain a sliding view of a fileJonathan Nieder2011-03-271-0/+2
| | | * | | Makefile: list one vcs-svn/xdiff object or header per lineJonathan Nieder2011-03-271-16/+44
| | * | | | Merge branch 'db/svn-fe-code-purge' into svn-feJonathan Nieder2011-05-261-10/+3
| | |\ \ \ \
| | | * | | | vcs-svn: drop obj_poolDavid Barr2011-03-221-3/+1
| | | * | | | vcs-svn: drop treapDavid Barr2011-03-221-3/+2
| | | * | | | vcs-svn: drop string_poolDavid Barr2011-03-221-8/+4
| | | |/ / /
* | | | | | Merge branch 'ar/i18n-no-gettext'Junio C Hamano2012-01-311-1/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXTJunio C Hamano2012-01-271-1/+1
| * | | | | i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10nJunio C Hamano2012-01-231-0/+1
| * | | | | add a Makefile switch to avoid gettext translation in shell scriptsAlex Riesen2012-01-231-1/+5
* | | | | | Merge branch 'jk/git-prompt'Junio C Hamano2011-12-221-0/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Makefile: OS X has /dev/ttyJeff King2011-12-121-0/+1
| * | | | | Makefile: linux has /dev/ttyJeff King2011-12-121-0/+1
| * | | | | add generic terminal prompt functionJeff King2011-12-121-0/+9
| * | | | | move git_getpass to its own source fileJeff King2011-12-121-0/+2
* | | | | | Merge branch 'ab/enable-i18n'Junio C Hamano2011-12-191-4/+77
|\ \ \ \ \ \
| * | | | | | i18n: add infrastructure for translating Git with gettextab/enable-i18nÆvar Arnfjörð Bjarmason2011-12-051-4/+77
* | | | | | | Merge branch 'tr/cache-tree'Junio C Hamano2011-12-191-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add test-scrap-cache-treeThomas Rast2011-12-061-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/credentials'Junio C Hamano2011-12-191-0/+15
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | credentials: add "store" helperJeff King2011-12-121-0/+1
| * | | | | | Makefile: unix sockets may not available on some platformsJohannes Sixt2011-12-121-3/+11
| * | | | | | credentials: add "cache" helperJeff King2011-12-111-0/+3
| * | | | | | introduce credentials APIJeff King2011-12-111-0/+3
| |/ / / / /
* | | | | | Merge branch 'jc/stream-to-pack'Junio C Hamano2011-12-161-0/+2
|\ \ \ \ \ \
| * | | | | | bulk-checkin: replace fast-import based implementationjc/stream-to-packJunio C Hamano2011-12-011-0/+2
* | | | | | | Merge branch 'jc/pull-signed-tag'Junio C Hamano2011-12-091-0/+2
|\ \ \ \ \ \ \