summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* symbolic-ref --short: abbreviate the output unambiguouslyjk/symbolic-ref-shortJan Krüger2012-02-272-4/+14
* 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
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/configure-libintl' into maintJunio C Hamano2012-02-261-8/+12
| |\ \ \ \ \
| * \ \ \ \ \ Sync with 1.7.8.5Junio C Hamano2012-02-266-6/+39
| |\ \ \ \ \ \
| | * | | | | | Git 1.7.8.5v1.7.8.5Junio C Hamano2012-02-263-2/+21
| | * | | | | | grep -P: Fix matching ^ and $Michał Kiedrowicz2012-02-261-1/+1
| | * | | | | | am: don't infloop for an empty input fileJim Meyering2012-02-262-1/+11
| | * | | | | | rebase -m: only call "notes copy" when rewritten exists and is non-emptyAndrew Wong2012-02-261-4/+7
| | * | | | | | Makefile: add thread-utils.h to LIB_HDmitry V. Levin2012-02-261-0/+1
| | | |_|/ / / | | |/| | | |
| * | | | | | git-p4: remove bash-ism in t9800Pete Wyckoff2012-02-261-9/+15
| * | | | | | git-p4: remove bash-ism in t9809Pete Wyckoff2012-02-261-1/+1
| * | | | | | git-p4: fix submit regression with clientSpec and subdir clonePete Wyckoff2012-02-262-43/+185
| * | | | | | git-p4: set useClientSpec variable on initial clonePete Wyckoff2012-02-263-4/+34
* | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-02-231-1/+24
* | | | | | | Merge branch 'ld/git-p4-expanded-keywords'Junio C Hamano2012-02-233-10/+501
|\ \ \ \ \ \ \
| * | | | | | | git-p4: add initial support for RCS keywordsld/git-p4-expanded-keywordsLuke Diamand2012-02-233-10/+501
* | | | | | | | Merge branch 'jk/config-include'Junio C Hamano2012-02-238-60/+495
|\ \ \ \ \ \ \ \
| * | | | | | | | config: add include directiveJeff King2012-02-177-14/+292
| * | | | | | | | config: eliminate config_exclusive_filenameJeff King2012-02-172-9/+3
| * | | | | | | | config: stop using config_exclusive_filenameJeff King2012-02-172-24/+60
| * | | | | | | | config: provide a version of git_config with more optionsJeff King2012-02-173-4/+27
| * | | | | | | | config: teach git_config_rename_section a file argumentJeff King2012-02-172-7/+14
View Lorry Controller Status