summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | grep: move the configuration parsing logic to grep.[ch]Junio C Hamano2012-10-093-131/+134
| * | | | | | | | | | | | | | | builtin/grep.c: make configuration callback more reusableJunio C Hamano2012-10-091-25/+79
* | | | | | | | | | | | | | | | Merge branch 'jl/submodule-add-by-name'Jeff King2012-10-295-14/+121
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | submodule add: Fail when .git/modules/<name> already exists unless forcedJens Lehmann2012-09-303-2/+45
| * | | | | | | | | | | | | | | | Teach "git submodule add" the --name optionJens Lehmann2012-09-294-12/+76
* | | | | | | | | | | | | | | | | Merge branch 'jl/submodule-rm'Jeff King2012-10-295-15/+550
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | submodule: teach rm to remove submodules unless they contain a git directoryJens Lehmann2012-09-295-15/+550
* | | | | | | | | | | | | | | | | Merge branch 'jk/strbuf-detach-always-non-null'Jeff King2012-10-251-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | strbuf: always return a non-NULL value from strbuf_detachJeff King2012-10-181-1/+3
* | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-fflush-errno'Jeff King2012-10-253-6/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | maybe_flush_or_die: move a too-loose Windows specific errorJohannes Sixt2012-10-173-6/+26
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'da/mergetools-p4'Jeff King2012-10-251-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | mergetools/p4merge: Handle "/dev/null"David Aguilar2012-10-111-0/+25
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/test-say-color-avoid-echo-escape'Jeff King2012-10-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | test-lib: Fix say_color () not to interpret \a\b\c in the messageJunio C Hamano2012-10-111-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/attr-match-optim'Jeff King2012-10-251-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | attr: avoid searching for basename on every matchNguyễn Thái Ngọc Duy2012-10-051-6/+9
| * | | | | | | | | | | | | | | | | | attr: avoid strlen() on every matchNguyễn Thái Ngọc Duy2012-10-051-2/+4
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/peel-ref'Jeff King2012-10-255-36/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | upload-pack: use peel_ref for ref advertisementsJeff King2012-10-041-11/+3
| * | | | | | | | | | | | | | | | | | peel_ref: check object type before loadingJeff King2012-10-041-2/+9
| * | | | | | | | | | | | | | | | | | peel_ref: do not return a null sha1Jeff King2012-10-044-22/+6
| * | | | | | | | | | | | | | | | | | peel_ref: use faster deref_tag_noverifyJeff King2012-10-041-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'bw/config-lift-variable-name-length-limit'Jeff King2012-10-251-30/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Remove the hard coded length limit on variable names in config filesBen Walton2012-10-011-30/+29
* | | | | | | | | | | | | | | | | | | | Merge branch 'fa/remote-svn'Jeff King2012-10-2516-38/+655
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add a test script for remote-svnFlorian Achleitner2012-10-071-0/+84
| * | | | | | | | | | | | | | | | | | | | remote-svn: add marks-file regenerationFlorian Achleitner2012-10-071-0/+71
| * | | | | | | | | | | | | | | | | | | | Add a svnrdump-simulator replaying a dump file for testingFlorian Achleitner2012-10-071-0/+53
| * | | | | | | | | | | | | | | | | | | | remote-svn: add incremental importFlorian Achleitner2012-10-077-17/+95
| * | | | | | | | | | | | | | | | | | | | remote-svn: Activate import/export-marks for fast-importFlorian Achleitner2012-10-071-1/+11
| * | | | | | | | | | | | | | | | | | | | Create a note for every imported commit containing svn metadataFlorian Achleitner2012-10-073-4/+33
| * | | | | | | | | | | | | | | | | | | | vcs-svn: add fast_export_note to create notesDmitry Ivankov2012-10-072-0/+14
| * | | | | | | | | | | | | | | | | | | | Allow reading svn dumps from files via file:// urlsFlorian Achleitner2012-10-071-19/+33
| * | | | | | | | | | | | | | | | | | | | remote-svn, vcs-svn: Enable fetching to private refsFlorian Achleitner2012-10-076-12/+12
| * | | | | | | | | | | | | | | | | | | | When debug==1, start fast-import with "--stats" instead of "--quiet"Florian Achleitner2012-10-071-1/+1
| * | | | | | | | | | | | | | | | | | | | Add documentation for the 'bidi-import' capability of remote-helpersFlorian Achleitner2012-10-071-1/+20
| * | | | | | | | | | | | | | | | | | | | Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capab...Florian Achleitner2012-10-071-13/+31
| * | | | | | | | | | | | | | | | | | | | Add argv_array_detach and argv_array_free_detachedFlorian Achleitner2012-10-073-0/+30
| * | | | | | | | | | | | | | | | | | | | Add svndump_init_fd to allow reading dumps from arbitrary FDsFlorian Achleitner2012-10-072-4/+19
| * | | | | | | | | | | | | | | | | | | | Add git-remote-testsvn to MakefileFlorian Achleitner2012-10-072-0/+6
| * | | | | | | | | | | | | | | | | | | | Implement a remote helper for svn in CFlorian Achleitner2012-10-071-0/+176
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jm/diff-context-config'Jeff King2012-10-253-1/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t4055: avoid use of sed 'a' commandJunio C Hamano2012-10-021-6/+5
| * | | | | | | | | | | | | | | | | | | | | diff: diff.context configuration gives default to -UJeff Muizelaar2012-09-303-1/+105
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/no-more-pre-exec-callback'Jeff King2012-10-253-29/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | pager: drop "wait for output to run less" hackJeff King2012-06-053-29/+0
* | | | | | | | | | | | | | | | | | | | | Git 1.8.0v1.8.0Junio C Hamano2012-10-213-10/+19
* | | | | | | | | | | | | | | | | | | | | Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-guiJunio C Hamano2012-10-1715-37/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | git-gui 0.17gitgui-0.17.0Pat Thoyts2012-10-171-1/+1