summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | difftool: provide basename to external toolsMichael J Gruber2010-12-162-0/+2
* | | | | | | | | | | git-difftool.txt: correct the description of $BASE and describe $MERGEDMichael J Gruber2010-12-161-2/+3
* | | | | | | | | | | Git 1.7.3.4v1.7.3.4Junio C Hamano2010-12-159-18/+113
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Git 1.7.2.5v1.7.2.5Junio C Hamano2010-12-159-19/+111
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Git 1.7.1.4v1.7.1.4Junio C Hamano2010-12-158-19/+104
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Git 1.7.0.9v1.7.0.9Junio C Hamano2010-12-157-19/+96
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Git 1.6.6.3v1.6.6.3Junio C Hamano2010-12-156-19/+88
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Git 1.6.5.9v1.6.5.9Junio C Hamano2010-12-155-18/+64
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Git 1.6.4.5v1.6.4.5Junio C Hamano2010-12-153-2/+22
| | | | | | * | | | | | | gitweb: Introduce esc_attr to escape attributes of HTML elementsJakub Narebski2010-12-151-15/+22
* | | | | | | | | | | | | Prepare for 1.7.3.4Junio C Hamano2010-12-141-0/+10
* | | | | | | | | | | | | use persistent memory for rejected pathsClemens Buchacher2010-12-144-42/+38
* | | | | | | | | | | | | do not overwrite files in leading pathClemens Buchacher2010-12-144-10/+31
* | | | | | | | | | | | | lstat_cache: optionally return match_lenClemens Buchacher2010-12-141-16/+27
* | | | | | | | | | | | | add function check_ok_to_remove()Clemens Buchacher2010-12-141-49/+58
* | | | | | | | | | | | | t7607: add leading-path testsClemens Buchacher2010-12-141-0/+51
* | | | | | | | | | | | | t7607: use test-lib functions and check MERGE_HEADClemens Buchacher2010-12-141-23/+15
* | | | | | | | | | | | | Merge branch 'jc/maint-no-openssl-build-fix' into maintJunio C Hamano2010-12-141-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Do not link with -lcrypto under NO_OPENSSLJunio C Hamano2010-12-081-0/+4
* | | | | | | | | | | | | | Merge branch 'ja/maint-pull-rebase-doc' into maintJunio C Hamano2010-12-141-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-pull.txt: Mention branch.autosetuprebaseJari Aalto2010-12-031-2/+3
* | | | | | | | | | | | | | | Merge branch 'tc/http-urls-ends-with-slash' into maintJunio C Hamano2010-12-149-40/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | http-fetch: rework url handlingTay Ray Chuan2010-11-261-11/+5
| * | | | | | | | | | | | | | | http-push: add trailing slash at arg-parse time, instead of later onTay Ray Chuan2010-11-261-13/+2
| * | | | | | | | | | | | | | | http-push: check path length before using itTay Ray Chuan2010-11-261-2/+10
| * | | | | | | | | | | | | | | http-push: Normalise directory names when pushing to some WebDAV serversTay Ray Chuan2010-11-261-0/+4
| * | | | | | | | | | | | | | | http-backend: use end_url_with_slash()Tay Ray Chuan2010-11-261-3/+1
| * | | | | | | | | | | | | | | url: add str wrapper for end_url_with_slash()Tay Ray Chuan2010-11-262-0/+8
| * | | | | | | | | | | | | | | shift end_url_with_slash() from http.[ch] to url.[ch]Tay Ray Chuan2010-11-265-9/+12
| * | | | | | | | | | | | | | | t5550-http-fetch: add test for http-fetchTay Ray Chuan2010-11-261-1/+13
| * | | | | | | | | | | | | | | t5550-http-fetch: add missing '&&'Tay Ray Chuan2010-11-261-1/+1
* | | | | | | | | | | | | | | | Merge branch 'nd/maint-hide-checkout-index-from-error' into maintJunio C Hamano2010-12-141-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | entry.c: remove "checkout-index" from error messagesNguyễn Thái Ngọc Duy2010-11-291-8/+8
* | | | | | | | | | | | | | | | | Merge branch 'jk/maint-reflog-bottom' into maintJunio C Hamano2010-12-143-2/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | reflogs: clear flags properly in corner caseJeff King2010-11-233-2/+37
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'mz/rebase-abort-reflog-fix' into maintJunio C Hamano2010-12-142-9/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rebase --abort: do not update branch refMartin von Zweigbergk2010-11-232-9/+22
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'mz/maint-rebase-stat-config' into maintJunio C Hamano2010-12-141-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rebase: only show stat if configured to trueMartin von Zweigbergk2010-11-291-1/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'gc/http-with-non-ascii-username-url' into maintJunio C Hamano2010-12-145-1/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix username and password extraction from HTTP URLsGabriel Corona2010-11-172-2/+12
| * | | | | | | | | | | | | | | | t5550: test HTTP authentication and userinfo decodingGabriel Corona2010-11-174-0/+40
* | | | | | | | | | | | | | | | | Prepare for 1.7.3.4Junio C Hamano2010-12-102-1/+33
* | | | | | | | | | | | | | | | | Merge branch 'jk/maint-decorate-01-bool' into maintJunio C Hamano2010-12-102-2/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | log.decorate: accept 0/1 bool valuesJeff King2010-11-172-2/+23
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'mg/maint-tag-rfc1991' into maintJunio C Hamano2010-12-105-20/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | tag: recognize rfc1991 signaturesMichael J Gruber2010-11-102-7/+9
| * | | | | | | | | | | | | | | | | tag: factor out sig detection for tag displayMichael J Gruber2010-11-101-2/+2
| * | | | | | | | | | | | | | | | | tag: factor out sig detection for body editsMichael J Gruber2010-11-101-10/+2
| * | | | | | | | | | | | | | | | | verify-tag: factor out signature detectionMichael J Gruber2010-11-103-8/+16