summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | t/t7004-tag: test handling of rfc1991 signaturesMichael J Gruber2010-11-101-0/+66
* | | | | | | Merge branch 'ks/maint-getenv-fix' into maintJunio C Hamano2010-12-101-0/+1
|\ \ \ \ \ \ \
| * | | | | | | setup: make sure git_dir path is in a permanent buffer, getenv(3) caseKirill Smelkov2010-11-121-0/+1
* | | | | | | | Add --force to git-send-email documentationAlejandro R. Sedeño2010-12-101-0/+3
* | | | | | | | Merge branch 'jn/ignore-doc' into maintJunio C Hamano2010-12-091-7/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: point to related commands from gitignoreJonathan Nieder2010-11-111-5/+19
| * | | | | | | | Documentation: split gitignore page into sectionsJonathan Nieder2010-11-111-2/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'jn/cherry-pick-refresh-index' into maintJunio C Hamano2010-12-092-2/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | cherry-pick/revert: transparently refresh indexJonathan Nieder2010-11-102-2/+26
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jl/add-p-reverse-message' into maintJunio C Hamano2010-12-091-2/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Correct help blurb in checkout -p and friendsJonathan "Duke" Leto2010-10-281-2/+11
* | | | | | | | | Merge branch 'np/diff-in-corrupt-repository' into maintJunio C Hamano2010-12-091-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff: don't presume empty file when corresponding object is missingNicolas Pitre2010-10-211-2/+6
* | | | | | | | | | Merge branch 'fc/apply-p2-get-header-name' into maintJunio C Hamano2010-12-092-14/+40
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test: git-apply -p2 rename/chmod onlyJunio C Hamano2010-11-051-0/+26
| * | | | | | | | | | Fix git-apply with -p greater than 1Federico Cuello2010-11-051-14/+14
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'np/pack-broken-boundary' into maintJunio C Hamano2010-12-091-1/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | make pack-objects a bit more resilient to repo corruptionNicolas Pitre2010-10-221-1/+15
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ak/apply-non-git-epoch' into maintJunio C Hamano2010-12-095-6/+57
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply: handle patches with funny filename and colon in timezoneJonathan Nieder2010-11-104-2/+48
| * | | | | | | | | | apply: Recognize epoch timestamps with : in the timezoneAnders Kaseorg2010-10-132-4/+9