summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge branch 'maint'Junio C Hamano2012-02-273-4/+22
| |\
| | * Update draft release notes to 1.7.9.3Junio C Hamano2012-02-271-0/+7
| | * Merge branch 'pj/remote-set-branches-usage-fix' into maintJunio C Hamano2012-02-272-2/+2
| | |\
| | * \ Merge branch 'jn/gitweb-unborn-head' into maintJunio C Hamano2012-02-272-2/+11
| | |\ \
| | * \ \ Merge branch 'jn/ancient-meld-support' into maintJunio C Hamano2012-02-271-1/+1
| | |\ \ \
| | * \ \ \ Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano2012-02-271-0/+10
| | |\ \ \ \
| | * | | | | CodingGuidelines: do not use 'which' in shell scriptsTim Henigan2012-02-271-0/+5
| | * | | | | CodingGuidelines: Add a note about spaces after redirectionTim Henigan2012-02-271-0/+7
| | * | | | | post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctlyMichael Haggerty2012-02-271-3/+3
| | * | | | | post-receive-email: remove unused variableMichael Haggerty2012-02-271-1/+0
| * | | | | | git-p4: missing she-bang line in t9804 confuses proveZbigniew Jędrzejewski-Szmek2012-02-271-0/+2
| * | | | | | grep -P: add tests for matching ^ and $Michał Kiedrowicz2012-02-271-0/+23
| * | | | | | send-email: document the --smtp-debug optionZbigniew Jędrzejewski-Szmek2012-02-271-0/+4
| * | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-02-261-6/+35
| * | | | | | Merge branch 'jn/gitweb-search-optim'Junio C Hamano2012-02-261-13/+53
| |\ \ \ \ \ \
| | * | | | | | gitweb: Faster project searchjn/gitweb-search-optimJakub Narebski2012-02-231-2/+7
| | * | | | | | gitweb: Option for filling only specified info in fill_project_list_infoJakub Narebski2012-02-231-8/+25
| | * | | | | | gitweb: Refactor checking if part of project info need fillingJakub Narebski2012-02-231-8/+26
| * | | | | | | Merge branch 'tr/maint-bundle-long-subject'Junio C Hamano2012-02-265-51/+67
| |\ \ \ \ \ \ \
| | * | | | | | | t5704: match tests to modern styletr/maint-bundle-long-subjectThomas Rast2012-02-231-25/+8
| | * | | | | | | strbuf: improve strbuf_get*line documentationThomas Rast2012-02-231-1/+17
| | * | | | | | | bundle: use a strbuf to scan the log for boundary commitsThomas Rast2012-02-232-7/+24
| | * | | | | | | bundle: put strbuf_readline_fd in strbuf.c with adjustmentsThomas Rast2012-02-223-19/+19
| * | | | | | | | Merge branch 'sp/smart-http-failure-to-push'Junio C Hamano2012-02-261-3/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | disconnect from remote helpers more gentlysp/smart-http-failure-to-pushJeff King2012-02-231-3/+10
| * | | | | | | | | Merge branch 'fc/push-prune'Junio C Hamano2012-02-267-40/+101
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | push: add '--prune' optionfc/push-pruneFelipe Contreras2012-02-227-5/+60
| | * | | | | | | | | remote: refactor code into alloc_delete_ref()Felipe Contreras2012-02-221-5/+9
| | * | | | | | | | | remote: reorganize check_pattern_match()Felipe Contreras2012-02-221-29/+30
| | * | | | | | | | | remote: use a local variable in match_push_refs()Felipe Contreras2012-02-221-9/+10
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'jc/doc-merge-options'Junio C Hamano2012-02-261-11/+11
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Documentation/merge-options.txt: group "ff" related options togetherjc/doc-merge-optionsJunio C Hamano2012-02-221-11/+11
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'jk/maint-avoid-streaming-filtered-contents'Junio C Hamano2012-02-264-9/+125
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | do not stream large files to pack when filters are in usejk/maint-avoid-streaming-filtered-contentsJeff King2012-02-242-5/+95
| | * | | | | | | | | teach dry-run convert_to_git not to require a src bufferJeff King2012-02-241-2/+10
| | * | | | | | | | | teach convert_to_git a "dry run" modeJeff King2012-02-242-2/+20
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'jb/filter-ignore-sigpipe'Junio C Hamano2012-02-261-0/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Ignore SIGPIPE when running a filter driverjb/filter-ignore-sigpipeJehan Bing2012-02-211-0/+5
| | |/ / / / / / / /
| * | | | | | | | | pack-objects: Fix compilation with NO_PTHREDSMichał Kiedrowicz2012-02-261-1/+1
| * | | | | | | | | Merge branch 'maint'Junio C Hamano2012-02-2612-72/+291
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Document accumulated fixes since 1.7.9.2Junio C Hamano2012-02-262-1/+18
| | * | | | | | | | Merge branch 'jc/add-refresh-unmerged' into maintJunio C Hamano2012-02-262-2/+24
| | |\ \ \ \ \ \ \ \