Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/grep-pcre-loose-ends' | Jeff King | 2012-10-29 | 7 | -129/+225 |
|\ | |||||
| * | log: honor grep.* configuration | Junio C Hamano | 2012-10-09 | 1 | -1/+7 |
| * | log --grep: accept --basic-regexp and --perl-regexp | Junio C Hamano | 2012-10-09 | 2 | -0/+14 |
| * | log --grep: use the same helper to set -E/-F options as "git grep" | Junio C Hamano | 2012-10-09 | 2 | -2/+8 |
| * | revisions: initialize revs->grep_filter using grep_init() | Junio C Hamano | 2012-10-09 | 2 | -2/+9 |
| * | grep: move pattern-type bits support to top-level grep.[ch] | Junio C Hamano | 2012-10-09 | 3 | -39/+45 |
| * | grep: move the configuration parsing logic to grep.[ch] | Junio C Hamano | 2012-10-09 | 3 | -131/+134 |
| * | builtin/grep.c: make configuration callback more reusable | Junio C Hamano | 2012-10-09 | 1 | -25/+79 |
* | | Merge branch 'jl/submodule-add-by-name' | Jeff King | 2012-10-29 | 5 | -14/+121 |
|\ \ | |||||
| * | | submodule add: Fail when .git/modules/<name> already exists unless forced | Jens Lehmann | 2012-09-30 | 3 | -2/+45 |
| * | | Teach "git submodule add" the --name option | Jens Lehmann | 2012-09-29 | 4 | -12/+76 |
* | | | Merge branch 'jl/submodule-rm' | Jeff King | 2012-10-29 | 5 | -15/+550 |
|\ \ \ | |||||
| * | | | submodule: teach rm to remove submodules unless they contain a git directory | Jens Lehmann | 2012-09-29 | 5 | -15/+550 |
* | | | | Merge branch 'jk/strbuf-detach-always-non-null' | Jeff King | 2012-10-25 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | strbuf: always return a non-NULL value from strbuf_detach | Jeff King | 2012-10-18 | 1 | -1/+3 |
* | | | | | Merge branch 'js/mingw-fflush-errno' | Jeff King | 2012-10-25 | 3 | -6/+26 |
|\ \ \ \ \ | |||||
| * | | | | | maybe_flush_or_die: move a too-loose Windows specific error | Johannes Sixt | 2012-10-17 | 3 | -6/+26 |
* | | | | | | Merge branch 'da/mergetools-p4' | Jeff King | 2012-10-25 | 1 | -0/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | mergetools/p4merge: Handle "/dev/null" | David Aguilar | 2012-10-11 | 1 | -0/+25 |
* | | | | | | | Merge branch 'jc/test-say-color-avoid-echo-escape' | Jeff King | 2012-10-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | test-lib: Fix say_color () not to interpret \a\b\c in the message | Junio C Hamano | 2012-10-11 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'nd/attr-match-optim' | Jeff King | 2012-10-25 | 1 | -8/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | attr: avoid searching for basename on every match | Nguyễn Thái Ngọc Duy | 2012-10-05 | 1 | -6/+9 |
| * | | | | | | | | attr: avoid strlen() on every match | Nguyễn Thái Ngọc Duy | 2012-10-05 | 1 | -2/+4 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/peel-ref' | Jeff King | 2012-10-25 | 5 | -36/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | upload-pack: use peel_ref for ref advertisements | Jeff King | 2012-10-04 | 1 | -11/+3 |
| * | | | | | | | | peel_ref: check object type before loading | Jeff King | 2012-10-04 | 1 | -2/+9 |
| * | | | | | | | | peel_ref: do not return a null sha1 | Jeff King | 2012-10-04 | 4 | -22/+6 |
| * | | | | | | | | peel_ref: use faster deref_tag_noverify | Jeff King | 2012-10-04 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'bw/config-lift-variable-name-length-limit' | Jeff King | 2012-10-25 | 1 | -30/+29 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove the hard coded length limit on variable names in config files | Ben Walton | 2012-10-01 | 1 | -30/+29 |
* | | | | | | | | | | Merge branch 'fa/remote-svn' | Jeff King | 2012-10-25 | 16 | -38/+655 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add a test script for remote-svn | Florian Achleitner | 2012-10-07 | 1 | -0/+84 |
| * | | | | | | | | | | remote-svn: add marks-file regeneration | Florian Achleitner | 2012-10-07 | 1 | -0/+71 |
| * | | | | | | | | | | Add a svnrdump-simulator replaying a dump file for testing | Florian Achleitner | 2012-10-07 | 1 | -0/+53 |
| * | | | | | | | | | | remote-svn: add incremental import | Florian Achleitner | 2012-10-07 | 7 | -17/+95 |
| * | | | | | | | | | | remote-svn: Activate import/export-marks for fast-import | Florian Achleitner | 2012-10-07 | 1 | -1/+11 |
| * | | | | | | | | | | Create a note for every imported commit containing svn metadata | Florian Achleitner | 2012-10-07 | 3 | -4/+33 |
| * | | | | | | | | | | vcs-svn: add fast_export_note to create notes | Dmitry Ivankov | 2012-10-07 | 2 | -0/+14 |
| * | | | | | | | | | | Allow reading svn dumps from files via file:// urls | Florian Achleitner | 2012-10-07 | 1 | -19/+33 |
| * | | | | | | | | | | remote-svn, vcs-svn: Enable fetching to private refs | Florian Achleitner | 2012-10-07 | 6 | -12/+12 |
| * | | | | | | | | | | When debug==1, start fast-import with "--stats" instead of "--quiet" | Florian Achleitner | 2012-10-07 | 1 | -1/+1 |
| * | | | | | | | | | | Add documentation for the 'bidi-import' capability of remote-helpers | Florian Achleitner | 2012-10-07 | 1 | -1/+20 |
| * | | | | | | | | | | Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capab... | Florian Achleitner | 2012-10-07 | 1 | -13/+31 |
| * | | | | | | | | | | Add argv_array_detach and argv_array_free_detached | Florian Achleitner | 2012-10-07 | 3 | -0/+30 |
| * | | | | | | | | | | Add svndump_init_fd to allow reading dumps from arbitrary FDs | Florian Achleitner | 2012-10-07 | 2 | -4/+19 |
| * | | | | | | | | | | Add git-remote-testsvn to Makefile | Florian Achleitner | 2012-10-07 | 2 | -0/+6 |
| * | | | | | | | | | | Implement a remote helper for svn in C | Florian Achleitner | 2012-10-07 | 1 | -0/+176 |
* | | | | | | | | | | | Merge branch 'jm/diff-context-config' | Jeff King | 2012-10-25 | 3 | -1/+104 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t4055: avoid use of sed 'a' command | Junio C Hamano | 2012-10-02 | 1 | -6/+5 |