Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bk/submodule-in-recursive-merge' | Junio C Hamano | 2011-10-19 | 4 | -4/+61 |
|\ | |||||
| * | submodule: Search for merges only at end of recursive merge | Brad King | 2011-10-13 | 4 | -5/+11 |
| * | submodule: Demonstrate known breakage during recursive merge | Brad King | 2011-10-13 | 1 | -0/+51 |
* | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' | Junio C Hamano | 2011-10-19 | 2 | -0/+46 |
|\ \ | |||||
| * | | fix "git apply --index ..." not to deref NULL | Jim Meyering | 2011-10-12 | 2 | -0/+46 |
* | | | Merge branch 'jk/config-test-cleanup' | Junio C Hamano | 2011-10-19 | 1 | -12/+7 |
|\ \ \ | |||||
| * | | | t1300: attempting to remove a non-existent .git/config is not an error | Johannes Sixt | 2011-10-19 | 1 | -12/+7 |
* | | | | Merge branch 'js/log-show-children' | Junio C Hamano | 2011-10-18 | 1 | -0/+12 |
|\ \ \ \ | |||||
| * | | | | log --childrenjs/log-show-children | Jay Soffian | 2011-10-04 | 1 | -0/+12 |
* | | | | | Merge branch 'cb/httpd-test-fix-port' | Junio C Hamano | 2011-10-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | use test number as port numbercb/httpd-test-fix-port | Clemens Buchacher | 2011-10-17 | 1 | -1/+1 |
* | | | | | | Merge branch 'jn/gitweb-manpages' | Junio C Hamano | 2011-10-18 | 9 | -479/+1649 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitweb: Add gitweb manpages to 'gitweb' package in git.specjn/gitweb-manpages | Jakub Narebski | 2011-10-16 | 1 | -0/+7 |
| * | | | | | | Documentation: Add gitweb config variables to git-config(1) | Jakub Narebski | 2011-10-16 | 1 | -0/+17 |
| * | | | | | | Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages | Jakub Narebski | 2011-10-16 | 2 | -0/+5 |
| * | | | | | | gitweb: Add gitweb(1) manpage for gitweb itself | Jakub Narebski | 2011-10-16 | 5 | -346/+743 |
| * | | | | | | gitweb: Add gitweb.conf(5) manpage for gitweb configuration files | Drew Northup | 2011-10-16 | 3 | -134/+878 |
* | | | | | | | Merge branch 'pt/mingw-misc-fixes' | Junio C Hamano | 2011-10-18 | 8 | -29/+41 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t9901: fix line-ending dependency on windows | Pat Thoyts | 2011-10-15 | 1 | -15/+12 |
| * | | | | | | | mingw: ensure sockets are initialized before calling gethostname | Pat Thoyts | 2011-10-15 | 2 | -0/+10 |
| * | | | | | | | mergetools: use the correct tool for Beyond Compare 3 on Windows | Pat Thoyts | 2011-10-15 | 1 | -1/+6 |
| * | | | | | | | t9300: do not run --cat-blob-fd related tests on MinGW | Johannes Schindelin | 2011-10-14 | 1 | -4/+4 |
| * | | | | | | | git-svn: On MSYS, escape and quote SVN_SSH also if set by the user | Sebastian Schuberth | 2011-10-14 | 1 | -8/+7 |
| * | | | | | | | t9001: do not fail only due to CR/LF issues | Johannes Schindelin | 2011-10-14 | 1 | -0/+1 |
| * | | | | | | | t1020: disable the pwd test on MinGW | Johannes Schindelin | 2011-10-14 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'md/smtp-tls-hello-again' | Junio C Hamano | 2011-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | send-email: Honour SMTP domain when using TLS | Matthew Daley | 2011-10-15 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-10-18 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline() | Brandon Casey | 2011-10-18 | 1 | -1/+0 |
* | | | | | | | | | | Update draft release notes to 1.7.8 | Junio C Hamano | 2011-10-17 | 1 | -1/+37 |
* | | | | | | | | | | Merge branch 'jk/http-auth' | Junio C Hamano | 2011-10-17 | 9 | -69/+130 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | http_init: accept separate URL parameter | Jeff King | 2011-10-15 | 5 | -16/+8 |
| * | | | | | | | | | | http: use hostname in credential description | Michael J Gruber | 2011-10-15 | 2 | -10/+37 |
| * | | | | | | | | | | http: retry authentication failures for all http requests | Jeff King | 2011-07-20 | 1 | -6/+11 |
| * | | | | | | | | | | remote-curl: don't retry auth failures with dumb protocol | Jeff King | 2011-07-20 | 1 | -1/+1 |
| * | | | | | | | | | | improve httpd auth tests | Jeff King | 2011-07-20 | 2 | -8/+53 |
| * | | | | | | | | | | url: decode buffers that are not NUL-terminated | Jeff King | 2011-07-20 | 3 | -31/+23 |
* | | | | | | | | | | | Merge branch 'js/check-ref-format-test-mingw' | Junio C Hamano | 2011-10-17 | 1 | -36/+52 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t1402-check-ref-format: skip tests of refs beginning with slash on Windows | Johannes Sixt | 2011-10-13 | 1 | -36/+52 |
* | | | | | | | | | | | | Merge branch 'jk/pull-rebase-with-work-tree' | Junio C Hamano | 2011-10-17 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | pull,rebase: handle GIT_WORK_TREE better | Jeff King | 2011-10-13 | 2 | -2/+2 |
* | | | | | | | | | | | | | Merge branch 'jk/config-test-cleanup' | Junio C Hamano | 2011-10-17 | 1 | -83/+120 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | t1300: test mixed-case variable retrieval | Jeff King | 2011-10-12 | 1 | -0/+27 |
| * | | | | | | | | | | | | t1300: put git invocations inside test function | Jeff King | 2011-10-12 | 1 | -83/+93 |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'bc/attr-ignore-case' | Junio C Hamano | 2011-10-17 | 10 | -34/+90 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | attr.c: respect core.ignorecase when matching attribute patterns | Brandon Casey | 2011-10-11 | 2 | -3/+61 |
| * | | | | | | | | | | | | attr: read core.attributesfile from git_default_core_config | Junio C Hamano | 2011-10-06 | 5 | -13/+9 |
| * | | | | | | | | | | | | builtin/mv.c: plug miniscule memory leak | Brandon Casey | 2011-10-06 | 1 | -1/+5 |
| * | | | | | | | | | | | | cleanup: use internal memory allocation wrapper functions everywhere | Brandon Casey | 2011-10-06 | 7 | -8/+8 |
| * | | | | | | | | | | | | attr.c: avoid inappropriate access to strbuf "buf" member | Brandon Casey | 2011-10-06 | 1 | -13/+11 |