aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-19
|\
| * Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-06
| |\
| | * cherry-pick: do not give irrelevant advice when cherry-pick puntedJay Soffian2011-10-06
| | * revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-06
* | | Merge branch 'bk/submodule-in-recursive-merge'Junio C Hamano2011-10-19
|\ \ \
| * | | submodule: Search for merges only at end of recursive mergeBrad King2011-10-13
| * | | submodule: Demonstrate known breakage during recursive mergeBrad King2011-10-13
* | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano2011-10-19
|\ \ \ \
| * | | | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-12
* | | | | Merge branch 'jk/config-test-cleanup'Junio C Hamano2011-10-19
|\ \ \ \ \
| * | | | | t1300: attempting to remove a non-existent .git/config is not an errorJohannes Sixt2011-10-19
* | | | | | Merge branch 'js/log-show-children'Junio C Hamano2011-10-18
|\ \ \ \ \ \
| * | | | | | log --childrenJay Soffian2011-10-04
* | | | | | | Merge branch 'cb/httpd-test-fix-port'Junio C Hamano2011-10-18
|\ \ \ \ \ \ \
| * | | | | | | use test number as port numberClemens Buchacher2011-10-17
* | | | | | | | Merge branch 'jn/gitweb-manpages'Junio C Hamano2011-10-18
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb: Add gitweb manpages to 'gitweb' package in git.specJakub Narebski2011-10-16
| * | | | | | | | Documentation: Add gitweb config variables to git-config(1)Jakub Narebski2011-10-16
| * | | | | | | | Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpagesJakub Narebski2011-10-16
| * | | | | | | | gitweb: Add gitweb(1) manpage for gitweb itselfJakub Narebski2011-10-16
| * | | | | | | | gitweb: Add gitweb.conf(5) manpage for gitweb configuration filesDrew Northup2011-10-16
* | | | | | | | | Merge branch 'pt/mingw-misc-fixes'Junio C Hamano2011-10-18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t9901: fix line-ending dependency on windowsPat Thoyts2011-10-15
| * | | | | | | | | mingw: ensure sockets are initialized before calling gethostnamePat Thoyts2011-10-15
| * | | | | | | | | mergetools: use the correct tool for Beyond Compare 3 on WindowsPat Thoyts2011-10-15
| * | | | | | | | | t9300: do not run --cat-blob-fd related tests on MinGWJohannes Schindelin2011-10-14
| * | | | | | | | | git-svn: On MSYS, escape and quote SVN_SSH also if set by the userSebastian Schuberth2011-10-14
| * | | | | | | | | t9001: do not fail only due to CR/LF issuesJohannes Schindelin2011-10-14
| * | | | | | | | | t1020: disable the pwd test on MinGWJohannes Schindelin2011-10-14
* | | | | | | | | | Merge branch 'md/smtp-tls-hello-again'Junio C Hamano2011-10-18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | send-email: Honour SMTP domain when using TLSMatthew Daley2011-10-15
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-10-18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline()Brandon Casey2011-10-18
* | | | | | | | | | | | Update draft release notes to 1.7.8Junio C Hamano2011-10-17
* | | | | | | | | | | | Merge branch 'jk/http-auth'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | http_init: accept separate URL parameterJeff King2011-10-15
| * | | | | | | | | | | | http: use hostname in credential descriptionMichael J Gruber2011-10-15
| * | | | | | | | | | | | http: retry authentication failures for all http requestsJeff King2011-07-20
| * | | | | | | | | | | | remote-curl: don't retry auth failures with dumb protocolJeff King2011-07-20
| * | | | | | | | | | | | improve httpd auth testsJeff King2011-07-20
| * | | | | | | | | | | | url: decode buffers that are not NUL-terminatedJeff King2011-07-20
* | | | | | | | | | | | | Merge branch 'js/check-ref-format-test-mingw'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t1402-check-ref-format: skip tests of refs beginning with slash on WindowsJohannes Sixt2011-10-13
* | | | | | | | | | | | | | Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | pull,rebase: handle GIT_WORK_TREE betterJeff King2011-10-13
* | | | | | | | | | | | | | | Merge branch 'jk/config-test-cleanup'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | t1300: test mixed-case variable retrievalJeff King2011-10-12
| * | | | | | | | | | | | | | t1300: put git invocations inside test functionJeff King2011-10-12
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'bc/attr-ignore-case'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | attr.c: respect core.ignorecase when matching attribute patternsBrandon Casey2011-10-11