summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* i18n: add infrastructure for translating Git with gettextab/enable-i18nÆvar Arnfjörð Bjarmason2011-12-0537-39/+1291
* Git 1.7.8-rc2v1.7.8-rc2Junio C Hamano2011-11-122-2/+2
* Merge branch 'ly/mktree-using-strbuf'Junio C Hamano2011-11-111-0/+1
|\
| * Merge "Move 'builtin-*' into a 'builtin/' subdirectory"ly/mktree-using-strbufJunio C Hamano2011-11-10943-17539/+77997
| |\
| * \ Merge 'build-in git-mktree'Junio C Hamano2011-11-101366-45469/+172869
| |\ \
| * | | mktree: fix a memory leak in write_tree()Liu Yuan2011-11-101-0/+1
* | | | Merge branch 'sn/complete-bash-wo-process-subst'Junio C Hamano2011-11-091-1/+1
|\ \ \ \
| * | | | completion: don't leak variable from the prompt into environmentSZEDER Gábor2011-11-091-1/+1
* | | | | Update draft release notes to 1.7.8Junio C Hamano2011-11-081-14/+5
* | | | | Merge branch 'jc/remote-setbranches-usage-fix'Junio C Hamano2011-11-081-1/+1
|\ \ \ \ \
| * | | | | remote: fix set-branches usagejc/remote-setbranches-usage-fixJunio C Hamano2011-11-061-1/+1
* | | | | | Merge branch 'fc/remote-seturl-usage-fix'Junio C Hamano2011-11-081-1/+1
|\ \ \ \ \ \
| * | | | | | remote: fix remote set-url usagefc/remote-seturl-usage-fixFelipe Contreras2011-11-061-1/+1
* | | | | | | Sync with 1.7.7.3Junio C Hamano2011-11-085-50/+67
|\ \ \ \ \ \ \
| * | | | | | | Git 1.7.7.3v1.7.7.3Junio C Hamano2011-11-083-2/+21
| * | | | | | | Merge branch 'jc/maint-remove-renamed-ref' into maintJunio C Hamano2011-11-081-8/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jm/maint-gitweb-filter-forks-fix' into maintJunio C Hamano2011-11-081-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'dm/pack-objects-update' into maintJunio C Hamano2011-11-081-19/+55
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | docs: Update install-doc-quickJunio C Hamano2011-11-083-50/+46
| * | | | | | | | | | docs: don't mention --quiet or --exit-code in git-log(1)Jeff King2011-11-081-0/+2
* | | | | | | | | | | Git 1.7.8-rc1v1.7.8-rc1Junio C Hamano2011-11-072-2/+6
* | | | | | | | | | | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-071-4/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame.c: Properly initialize strbuf after calling textconv_object(), againSebastian Schuberth2011-11-071-4/+3
* | | | | | | | | | | | Merge branch 'ab/i18n-test-fix'Junio C Hamano2011-11-062-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t/t7508-status.sh: use test_i18ncmpab/i18n-test-fixÆvar Arnfjörð Bjarmason2011-11-051-2/+2
| * | | | | | | | | | | | t/t6030-bisect-porcelain.sh: use test_i18ngrepÆvar Arnfjörð Bjarmason2011-11-051-1/+1
* | | | | | | | | | | | | Merge branch 'sn/http-auth-with-netrc-fix'Junio C Hamano2011-11-061-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | http: don't always prompt for passwordStefan Naewe2011-11-041-4/+3
* | | | | | | | | | | | | | Merge branch 'pw/p4-appledouble-fix'Junio C Hamano2011-11-062-0/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-p4: ignore apple filetypePete Wyckoff2011-11-052-0/+44
* | | | | | | | | | | | | | | receive-pack: do not expect object 0{40} to existJunio C Hamano2011-11-031-6/+11
* | | | | | | | | | | | | | | t3200: add test case for 'branch -m'Stefan Naewe2011-11-021-0/+5
* | | | | | | | | | | | | | | branch -m: handle no arg properlyTay Ray Chuan2011-11-021-5/+8
* | | | | | | | | | | | | | | Update draft release notes to 1.7.8Junio C Hamano2011-11-011-55/+11
* | | | | | | | | | | | | | | Sync with 1.7.7.2Junio C Hamano2011-11-012-1/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Git 1.7.7.2v1.7.7.2Junio C Hamano2011-11-012-1/+45
| * | | | | | | | | | | | | | Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano2011-11-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | t7511: avoid use of reserved filename on Windows.Pat Thoyts2011-10-311-1/+1
| * | | | | | | | | | | | | | | Merge branch 'md/smtp-tls-hello-again' into maintJunio C Hamano2011-11-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pull-rebase-with-work-tree' into maintJunio C Hamano2011-11-012-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-diffstat-numstat-context' into maintJunio C Hamano2011-11-011-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/bisect-no-checkout' into maintJunio C Hamano2011-11-011-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/attr-ignore-case' into maintJunio C Hamano2011-11-0111-36/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cn/fetch-prune' into maintJunio C Hamano2011-11-015-55/+137
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/smart-http-failure' into maintJunio C Hamano2011-11-011-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge jn/maint-http-error-messageJunio C Hamano2011-11-011-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/name-hash-dirent'Junio C Hamano2011-11-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | name-hash.c: always initialize dir_next pointerJohannes Sixt2011-11-011-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-012-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | (squash) test for previousJunio C Hamano2011-10-281-0/+11