Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tr/maint-bundle-long-subject' | Junio C Hamano | 2012-02-26 | 5 | -51/+67 |
|\ | |||||
| * | t5704: match tests to modern styletr/maint-bundle-long-subject | Thomas Rast | 2012-02-23 | 1 | -25/+8 |
| * | strbuf: improve strbuf_get*line documentation | Thomas Rast | 2012-02-23 | 1 | -1/+17 |
| * | bundle: use a strbuf to scan the log for boundary commits | Thomas Rast | 2012-02-23 | 2 | -7/+24 |
| * | bundle: put strbuf_readline_fd in strbuf.c with adjustments | Thomas Rast | 2012-02-22 | 3 | -19/+19 |
* | | Merge branch 'sp/smart-http-failure-to-push' | Junio C Hamano | 2012-02-26 | 1 | -3/+10 |
|\ \ | |||||
| * | | disconnect from remote helpers more gentlysp/smart-http-failure-to-push | Jeff King | 2012-02-23 | 1 | -3/+10 |
* | | | Merge branch 'fc/push-prune' | Junio C Hamano | 2012-02-26 | 7 | -40/+101 |
|\ \ \ | |||||
| * | | | push: add '--prune' optionfc/push-prune | Felipe Contreras | 2012-02-22 | 7 | -5/+60 |
| * | | | remote: refactor code into alloc_delete_ref() | Felipe Contreras | 2012-02-22 | 1 | -5/+9 |
| * | | | remote: reorganize check_pattern_match() | Felipe Contreras | 2012-02-22 | 1 | -29/+30 |
| * | | | remote: use a local variable in match_push_refs() | Felipe Contreras | 2012-02-22 | 1 | -9/+10 |
* | | | | Merge branch 'jc/doc-merge-options' | Junio C Hamano | 2012-02-26 | 1 | -11/+11 |
|\ \ \ \ | |||||
| * | | | | Documentation/merge-options.txt: group "ff" related options togetherjc/doc-merge-options | Junio C Hamano | 2012-02-22 | 1 | -11/+11 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jk/maint-avoid-streaming-filtered-contents' | Junio C Hamano | 2012-02-26 | 4 | -9/+125 |
|\ \ \ \ | |||||
| * | | | | do not stream large files to pack when filters are in usejk/maint-avoid-streaming-filtered-contents | Jeff King | 2012-02-24 | 2 | -5/+95 |
| * | | | | teach dry-run convert_to_git not to require a src buffer | Jeff King | 2012-02-24 | 1 | -2/+10 |
| * | | | | teach convert_to_git a "dry run" mode | Jeff King | 2012-02-24 | 2 | -2/+20 |
| |/ / / | |||||
* | | | | Merge branch 'jb/filter-ignore-sigpipe' | Junio C Hamano | 2012-02-26 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | Ignore SIGPIPE when running a filter driverjb/filter-ignore-sigpipe | Jehan Bing | 2012-02-21 | 1 | -0/+5 |
| |/ / / | |||||
* | | | | pack-objects: Fix compilation with NO_PTHREDS | Michał Kiedrowicz | 2012-02-26 | 1 | -1/+1 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2012-02-26 | 12 | -72/+291 |
|\ \ \ \ | |||||
| * | | | | Document accumulated fixes since 1.7.9.2 | Junio C Hamano | 2012-02-26 | 2 | -1/+18 |
| * | | | | Merge branch 'jc/add-refresh-unmerged' into maint | Junio C Hamano | 2012-02-26 | 2 | -2/+24 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'js/configure-libintl' into maint | Junio C Hamano | 2012-02-26 | 1 | -8/+12 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Sync with 1.7.8.5 | Junio C Hamano | 2012-02-26 | 6 | -6/+39 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Git 1.7.8.5v1.7.8.5 | Junio C Hamano | 2012-02-26 | 3 | -2/+21 |
| | * | | | | | | grep -P: Fix matching ^ and $ | Michał Kiedrowicz | 2012-02-26 | 1 | -1/+1 |
| | * | | | | | | am: don't infloop for an empty input file | Jim Meyering | 2012-02-26 | 2 | -1/+11 |
| | * | | | | | | rebase -m: only call "notes copy" when rewritten exists and is non-empty | Andrew Wong | 2012-02-26 | 1 | -4/+7 |
| | * | | | | | | Makefile: add thread-utils.h to LIB_H | Dmitry V. Levin | 2012-02-26 | 1 | -0/+1 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | git-p4: remove bash-ism in t9800 | Pete Wyckoff | 2012-02-26 | 1 | -9/+15 |
| * | | | | | | git-p4: remove bash-ism in t9809 | Pete Wyckoff | 2012-02-26 | 1 | -1/+1 |
| * | | | | | | git-p4: fix submit regression with clientSpec and subdir clone | Pete Wyckoff | 2012-02-26 | 2 | -43/+185 |
| * | | | | | | git-p4: set useClientSpec variable on initial clone | Pete Wyckoff | 2012-02-26 | 3 | -4/+34 |
* | | | | | | | Update draft release notes to 1.7.10 | Junio C Hamano | 2012-02-23 | 1 | -1/+24 |
* | | | | | | | Merge branch 'ld/git-p4-expanded-keywords' | Junio C Hamano | 2012-02-23 | 3 | -10/+501 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-p4: add initial support for RCS keywordsld/git-p4-expanded-keywords | Luke Diamand | 2012-02-23 | 3 | -10/+501 |
* | | | | | | | | Merge branch 'jk/config-include' | Junio C Hamano | 2012-02-23 | 8 | -60/+495 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: add include directive | Jeff King | 2012-02-17 | 7 | -14/+292 |
| * | | | | | | | | config: eliminate config_exclusive_filename | Jeff King | 2012-02-17 | 2 | -9/+3 |
| * | | | | | | | | config: stop using config_exclusive_filename | Jeff King | 2012-02-17 | 2 | -24/+60 |
| * | | | | | | | | config: provide a version of git_config with more options | Jeff King | 2012-02-17 | 3 | -4/+27 |
| * | | | | | | | | config: teach git_config_rename_section a file argument | Jeff King | 2012-02-17 | 2 | -7/+14 |
| * | | | | | | | | config: teach git_config_set_multivar_in_file a default path | Jeff King | 2012-02-17 | 1 | -13/+7 |
| * | | | | | | | | config: copy the return value of prefix_filename | Jeff King | 2012-02-17 | 1 | -3/+4 |
| * | | | | | | | | t1300: add missing &&-chaining | Jeff King | 2012-02-17 | 1 | -1/+1 |
| * | | | | | | | | docs/api-config: minor clarifications | Jeff King | 2012-02-17 | 1 | -7/+8 |
| * | | | | | | | | docs: add a basic description of the config API | Jeff King | 2012-02-06 | 1 | -0/+101 |
* | | | | | | | | | Merge branch 'jc/add-refresh-unmerged' | Junio C Hamano | 2012-02-23 | 2 | -2/+24 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | |