Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ab/i18n-test-fix' | Junio C Hamano | 2011-11-06 | 2 | -3/+3 |
|\ | |||||
| * | t/t7508-status.sh: use test_i18ncmpab/i18n-test-fix | Ævar Arnfjörð Bjarmason | 2011-11-05 | 1 | -2/+2 |
| * | t/t6030-bisect-porcelain.sh: use test_i18ngrep | Ævar Arnfjörð Bjarmason | 2011-11-05 | 1 | -1/+1 |
* | | Merge branch 'pw/p4-appledouble-fix' | Junio C Hamano | 2011-11-06 | 1 | -0/+31 |
|\ \ | |||||
| * | | git-p4: ignore apple filetype | Pete Wyckoff | 2011-11-05 | 1 | -0/+31 |
* | | | t3200: add test case for 'branch -m' | Stefan Naewe | 2011-11-02 | 1 | -0/+5 |
* | | | Sync with 1.7.7.2 | Junio C Hamano | 2011-11-01 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge branch 'rs/maint-estimate-cache-size' into maint | Junio C Hamano | 2011-11-01 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | t7511: avoid use of reserved filename on Windows. | Pat Thoyts | 2011-10-31 | 1 | -1/+1 |
| * | | | | Merge branch 'bc/attr-ignore-case' into maint | Junio C Hamano | 2011-11-01 | 1 | -1/+58 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'cn/fetch-prune' into maint | Junio C Hamano | 2011-11-01 | 1 | -0/+50 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'ss/blame-textconv-fake-working-tree' | Junio C Hamano | 2011-11-01 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | (squash) test for previous | Junio C Hamano | 2011-10-28 | 1 | -0/+11 |
* | | | | | | | | Merge branch 'ef/mingw-upload-archive' | Junio C Hamano | 2011-11-01 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | upload-archive: use start_command instead of fork | Erik Faye-Lund | 2011-10-30 | 1 | -5/+5 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-10-27 | 1 | -0/+50 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'rs/maint-estimate-cache-size' into maint | Junio C Hamano | 2011-10-27 | 1 | -0/+50 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | * | | | | | | | read-cache.c: fix index memory allocation | René Scharfe | 2011-10-26 | 1 | -0/+50 |
| * | | | | | | | | Merge branch 'maint-1.7.6' into maint | Junio C Hamano | 2011-10-26 | 4 | -18/+85 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'jm/mergetool-pathspec' into maint-1.7.6 | Junio C Hamano | 2011-10-26 | 1 | -18/+40 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'mz/remote-rename' into maint-1.7.6 | Junio C Hamano | 2011-10-26 | 1 | -0/+31 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6 | Junio C Hamano | 2011-10-26 | 1 | -0/+8 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6 | Junio C Hamano | 2011-10-26 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.7.6' into maint | Junio C Hamano | 2011-10-26 | 2 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | / / / / / / / | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6 | Junio C Hamano | 2011-10-26 | 2 | -0/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-ls-files-error-report' into maint | Junio C Hamano | 2011-09-23 | 1 | -0/+72 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-clone-alternates' into maint | Junio C Hamano | 2011-09-23 | 1 | -0/+23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/maint-clone-gitdir' into maint | Junio C Hamano | 2011-09-23 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/check-ref-format-print-normalize' into maint | Junio C Hamano | 2011-09-23 | 1 | -0/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/branch-set-upstream-previous' into maint | Junio C Hamano | 2011-09-23 | 1 | -0/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/reset-reflog-message-fix' into maint | Junio C Hamano | 2011-09-11 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'vi/make-test-vector-less-specific' into maint | Junio C Hamano | 2011-09-11 | 8 | -13/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-config-param' into maint | Junio C Hamano | 2011-09-11 | 1 | -0/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-1.7.2-status-ignored' into maint | Junio C Hamano | 2011-09-11 | 1 | -0/+121 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/maint-config-explicit-bool-display' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bk/ancestry-path' into maint | Junio C Hamano | 2011-10-15 | 1 | -0/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/mergetool-valgrind' into maint | Junio C Hamano | 2011-10-15 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/rebase-i-exec-edit' into maint | Junio C Hamano | 2011-10-15 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'lh/gitweb-site-html-head' | Junio C Hamano | 2011-10-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: provide a way to customize html headers | Lénaïc Huard | 2011-10-21 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/libperl-git-config' | Junio C Hamano | 2011-10-26 | 2 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add simple test for Git::config_path() in t/t9700-perl-git.sh | Jakub Narebski | 2011-10-21 | 2 | -1/+9 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cn/fetch-prune' | Junio C Hamano | 2011-10-26 | 1 | -0/+50 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch: treat --tags like refs/tags/*:refs/tags/* when pruning | Carlos Martín Nieto | 2011-10-15 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch: honor the user-provided refspecs when pruning refs | Carlos Martín Nieto | 2011-10-15 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5510: add tests for fetch --prune | Carlos Martín Nieto | 2011-10-07 | 1 | -0/+50 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/p4-update' | Junio C Hamano | 2011-10-21 | 5 | -324/+731 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: handle files with shell metacharacters | Luke Diamand | 2011-10-17 | 1 | -0/+64 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |