summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* http: rename HTTP_REAUTH to HTTP_AUTH_RETRYnl/http-proxy-moreNelson Benitez Leon2012-03-152-4/+4
* http: Avoid limit of retrying request only twiceNelson Benitez Leon2012-03-151-4/+7
* http: handle proxy authentication failure (error 407)Nelson Benitez Leon2012-03-151-0/+9
* http: handle proxy proactive authenticationNelson Benitez Leon2012-03-151-1/+27
* http: try http_proxy env var when http.proxy config option is not setNelson Benitez Leon2012-03-155-23/+46
* http: support proxies that require authenticationnl/http-proxy-authNelson Benitez Leon2012-03-021-1/+3
* Update draft release notes to 1.7.10Junio C Hamano2012-03-021-12/+21
* Merge branch 'maint'Junio C Hamano2012-03-021-1/+1
|\
| * Documentation: do not assume that n > 1 in <rev>~$nJunio C Hamano2012-03-021-1/+1
* | Merge branch 'cb/fsck-squelch-dangling'Junio C Hamano2012-03-015-17/+20
|\ \
| * | fsck: --no-dangling omits "dangling object" informationcb/fsck-squelch-danglingJunio C Hamano2012-02-285-17/+20
* | | Merge branch 'rs/no-no-no-parseopt'Junio C Hamano2012-03-018-32/+108
|\ \ \
| * | | parse-options: remove PARSE_OPT_NEGHELPrs/no-no-no-parseoptRené Scharfe2012-02-284-13/+5
| * | | parse-options: allow positivation of options starting, with no-René Scharfe2012-02-263-12/+20
| * | | test-parse-options: convert to OPT_BOOL()René Scharfe2012-02-262-6/+66
* | | | Merge branch 'th/git-diffall'Junio C Hamano2012-03-012-0/+292
|\ \ \ \
| * | | | contrib: add git-diffall scriptTim Henigan2012-02-272-0/+292
* | | | | Merge the initial l10n effort inJunio C Hamano2012-03-016-24/+7265
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/git-l10n/git-po into l10nl10nJunio C Hamano2012-03-011-4/+4
| |\ \ \ \ \
| | * | | | | l10n: leave leading space unchanged for zh_CN.pows33892012-03-011-4/+4
| * | | | | | Update l10n guide: change the repository URL, etcJiang Xin2012-03-012-10/+16
| * | | | | | Update l10n guideJunio C Hamano2012-02-292-22/+94
| |/ / / / /
| * | | | | Merge pull request from jiangxin/masterJiang Xin2012-02-291-121/+181
| |\ \ \ \ \
| | * | | | | l10n: update Chinese translation to the new git.poJiang Xin2012-02-281-121/+181
| |/ / / / /
| * | | | | l10n: Update git.pot (12 new messages)Jiang Xin2012-02-281-121/+184
| * | | | | Merge branch 'master' into git-poJiang Xin2012-02-28201-1989/+4948
| |\ \ \ \ \
| * | | | | | l10n: fast-forward here is ff-only merge, not pushYichao Yu2012-02-271-1/+1
| * | | | | | l10n: update zh_CN translation for "Fetching %s"Riku2012-02-271-1/+1
| * | | | | | l10n: po for zh_CNJiang Xin2012-02-151-0/+3611
| * | | | | | l10n: initial git.pot for 1.7.10 upcoming releaseJiang Xin2012-02-153-2/+3431
* | | | | | | Merge branch 'maint'Junio C Hamano2012-03-012-7/+12
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Documentation fixes in git-configLibor Pechacek2012-03-012-7/+12
* | | | | | | Merge branch 'nd/maint-verify-objects'Junio C Hamano2012-03-012-25/+18
|\ \ \ \ \ \ \
| * | | | | | | rev-list: fix --verify-objects --quiet becoming --objectsnd/maint-verify-objectsNguyễn Thái Ngọc Duy2012-02-282-13/+17
| * | | | | | | rev-list: remove BISECT_SHOW_TRIED flagNguyễn Thái Ngọc Duy2012-02-282-12/+1
* | | | | | | | Merge branch 'jn/maint-gitweb-invalid-regexp'Junio C Hamano2012-03-012-1/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb: Handle invalid regexp in regexp searchjn/maint-gitweb-invalid-regexpJakub Narebski2012-02-282-1/+20
* | | | | | | | | Merge branch 'cn/maint-rev-list-doc'Junio C Hamano2012-03-011-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: use {asterisk} in rev-list-options.txt when neededcn/maint-rev-list-docCarlos Martín Nieto2012-02-281-6/+6
* | | | | | | | | | Merge branch 'cn/maint-branch-with-bad'Junio C Hamano2012-03-012-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch: don't assume the merge filter ref existscn/maint-branch-with-badCarlos Martín Nieto2012-02-272-0/+8
| |/ / / / / / / / /
* | | | | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-02-281-1/+5
* | | | | | | | | | Merge branch 'pj/completion-remote-set-url-branches'Junio C Hamano2012-02-281-14/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | completion: normalize increment/decrement stylepj/completion-remote-set-url-branchesPhilip Jägenstedt2012-02-221-12/+10
| * | | | | | | | | | completion: remote set-* <name> and <branch>Philip Jägenstedt2012-02-221-3/+9
* | | | | | | | | | | Merge branch 'ph/cherry-pick-advice-refinement'Junio C Hamano2012-02-282-6/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cherry-pick: No advice to commit if --no-commitph/cherry-pick-advice-refinementPhil Hord2012-02-222-6/+25
* | | | | | | | | | | | Merge branch 'jb/required-filter'Junio C Hamano2012-02-283-14/+92
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add a setting to require a filter to be successfuljb/required-filterJehan Bing2012-02-173-14/+92
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-02-273-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |