Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tc/http-urls-ends-with-slash' into maint | Junio C Hamano | 2010-12-14 | 9 | -40/+55 |
|\ | |||||
| * | http-fetch: rework url handling | Tay Ray Chuan | 2010-11-26 | 1 | -11/+5 |
| * | http-push: add trailing slash at arg-parse time, instead of later on | Tay Ray Chuan | 2010-11-26 | 1 | -13/+2 |
| * | http-push: check path length before using it | Tay Ray Chuan | 2010-11-26 | 1 | -2/+10 |
| * | http-push: Normalise directory names when pushing to some WebDAV servers | Tay Ray Chuan | 2010-11-26 | 1 | -0/+4 |
| * | http-backend: use end_url_with_slash() | Tay Ray Chuan | 2010-11-26 | 1 | -3/+1 |
| * | url: add str wrapper for end_url_with_slash() | Tay Ray Chuan | 2010-11-26 | 2 | -0/+8 |
| * | shift end_url_with_slash() from http.[ch] to url.[ch] | Tay Ray Chuan | 2010-11-26 | 5 | -9/+12 |
| * | t5550-http-fetch: add test for http-fetch | Tay Ray Chuan | 2010-11-26 | 1 | -1/+13 |
| * | t5550-http-fetch: add missing '&&' | Tay Ray Chuan | 2010-11-26 | 1 | -1/+1 |
* | | Merge branch 'nd/maint-hide-checkout-index-from-error' into maint | Junio C Hamano | 2010-12-14 | 1 | -8/+8 |
|\ \ | |||||
| * | | entry.c: remove "checkout-index" from error messages | Nguyễn Thái Ngọc Duy | 2010-11-29 | 1 | -8/+8 |
* | | | Merge branch 'jk/maint-reflog-bottom' into maint | Junio C Hamano | 2010-12-14 | 3 | -2/+37 |
|\ \ \ | |||||
| * | | | reflogs: clear flags properly in corner case | Jeff King | 2010-11-23 | 3 | -2/+37 |
* | | | | Merge branch 'mz/rebase-abort-reflog-fix' into maint | Junio C Hamano | 2010-12-14 | 2 | -9/+22 |
|\ \ \ \ | |||||
| * | | | | rebase --abort: do not update branch ref | Martin von Zweigbergk | 2010-11-23 | 2 | -9/+22 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'mz/maint-rebase-stat-config' into maint | Junio C Hamano | 2010-12-14 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | rebase: only show stat if configured to true | Martin von Zweigbergk | 2010-11-29 | 1 | -1/+2 |
* | | | | | Merge branch 'gc/http-with-non-ascii-username-url' into maint | Junio C Hamano | 2010-12-14 | 5 | -1/+51 |
|\ \ \ \ \ | |||||
| * | | | | | Fix username and password extraction from HTTP URLs | Gabriel Corona | 2010-11-17 | 2 | -2/+12 |
| * | | | | | t5550: test HTTP authentication and userinfo decoding | Gabriel Corona | 2010-11-17 | 4 | -0/+40 |
* | | | | | | Prepare for 1.7.3.4 | Junio C Hamano | 2010-12-10 | 2 | -1/+33 |
* | | | | | | Merge branch 'jk/maint-decorate-01-bool' into maint | Junio C Hamano | 2010-12-10 | 2 | -2/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | log.decorate: accept 0/1 bool values | Jeff King | 2010-11-17 | 2 | -2/+23 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'mg/maint-tag-rfc1991' into maint | Junio C Hamano | 2010-12-10 | 5 | -20/+88 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tag: recognize rfc1991 signatures | Michael J Gruber | 2010-11-10 | 2 | -7/+9 |
| * | | | | | | tag: factor out sig detection for tag display | Michael J Gruber | 2010-11-10 | 1 | -2/+2 |
| * | | | | | | tag: factor out sig detection for body edits | Michael J Gruber | 2010-11-10 | 1 | -10/+2 |
| * | | | | | | verify-tag: factor out signature detection | Michael J Gruber | 2010-11-10 | 3 | -8/+16 |
| * | | | | | | t/t7004-tag: test handling of rfc1991 signatures | Michael J Gruber | 2010-11-10 | 1 | -0/+66 |
* | | | | | | | Merge branch 'ks/maint-getenv-fix' into maint | Junio C Hamano | 2010-12-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | setup: make sure git_dir path is in a permanent buffer, getenv(3) case | Kirill Smelkov | 2010-11-12 | 1 | -0/+1 |
* | | | | | | | | Add --force to git-send-email documentation | Alejandro R. Sedeño | 2010-12-10 | 1 | -0/+3 |
* | | | | | | | | Merge branch 'jn/ignore-doc' into maint | Junio C Hamano | 2010-12-09 | 1 | -7/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation: point to related commands from gitignore | Jonathan Nieder | 2010-11-11 | 1 | -5/+19 |
| * | | | | | | | | Documentation: split gitignore page into sections | Jonathan Nieder | 2010-11-11 | 1 | -2/+4 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jn/cherry-pick-refresh-index' into maint | Junio C Hamano | 2010-12-09 | 2 | -2/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | cherry-pick/revert: transparently refresh index | Jonathan Nieder | 2010-11-10 | 2 | -2/+26 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jl/add-p-reverse-message' into maint | Junio C Hamano | 2010-12-09 | 1 | -2/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Correct help blurb in checkout -p and friends | Jonathan "Duke" Leto | 2010-10-28 | 1 | -2/+11 |
* | | | | | | | | | Merge branch 'np/diff-in-corrupt-repository' into maint | Junio C Hamano | 2010-12-09 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | diff: don't presume empty file when corresponding object is missing | Nicolas Pitre | 2010-10-21 | 1 | -2/+6 |
* | | | | | | | | | | Merge branch 'fc/apply-p2-get-header-name' into maint | Junio C Hamano | 2010-12-09 | 2 | -14/+40 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | test: git-apply -p2 rename/chmod only | Junio C Hamano | 2010-11-05 | 1 | -0/+26 |
| * | | | | | | | | | | Fix git-apply with -p greater than 1 | Federico Cuello | 2010-11-05 | 1 | -14/+14 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'np/pack-broken-boundary' into maint | Junio C Hamano | 2010-12-09 | 1 | -1/+15 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | make pack-objects a bit more resilient to repo corruption | Nicolas Pitre | 2010-10-22 | 1 | -1/+15 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'ak/apply-non-git-epoch' into maint | Junio C Hamano | 2010-12-09 | 5 | -6/+57 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | apply: handle patches with funny filename and colon in timezone | Jonathan Nieder | 2010-11-10 | 4 | -2/+48 |
| * | | | | | | | | | | apply: Recognize epoch timestamps with : in the timezone | Anders Kaseorg | 2010-10-13 | 2 | -4/+9 |