summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Extend merge-subtree tests to test -Xsubtree=dir.Avery Pennarun2010-01-181-1/+46
* Teach git-pull to pass -X<option> to git-mergeAvery Pennarun2010-01-181-0/+8
* git merge -X<option>Avery Pennarun2010-01-181-0/+56
* Merge branch 'maint'Junio C Hamano2009-11-271-0/+17
|\
| * builtin-apply.c: pay attention to -p<n> when determining the nameJunio C Hamano2009-11-271-0/+17
| * Merge branch 'jk/maint-add-p-empty' into maintJunio C Hamano2009-11-161-0/+17
| |\
| * \ Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano2009-11-161-0/+20
| |\ \
| * \ \ Merge branch 'jk/maint-format-patch-p-suppress-stat' into maintJunio C Hamano2009-11-161-0/+21
| |\ \ \
| * \ \ \ Merge branch 'jk/maint-1.6.3-ls-files-i' into maintJunio C Hamano2009-11-161-0/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano2009-11-163-3/+110
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'maint-1.6.4' into maintJunio C Hamano2009-10-251-0/+32
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4Junio C Hamano2009-10-251-0/+32
| | |\ \ \ \ \ \
* | | | | | | | | t1200: fix a timing dependent errorNanako Shiraishi2009-11-251-3/+7
* | | | | | | | | Merge branch 'jc/log-stdin'Junio C Hamano2009-11-241-0/+61
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add trivial tests for --stdin option to log familyJunio C Hamano2009-11-231-0/+61
* | | | | | | | | | Merge branch 'mr/gitweb-snapshot'Junio C Hamano2009-11-243-1/+169
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t/gitweb-lib: Split HTTP response with non-GNU sedBrian Gernhardt2009-11-241-2/+12
| * | | | | | | | | | gitweb: Smarter snapshot namesMark Rada2009-11-091-5/+33
| * | | | | | | | | | gitweb: Document current snapshot rules via new testsJakub Narebski2009-11-091-0/+87
| * | | | | | | | | | t/gitweb-lib.sh: Split gitweb output into headers and bodyJakub Narebski2009-10-311-1/+5
| * | | | | | | | | | gitweb: check given hash before trying to create snapshotMark Rada2009-09-291-0/+39
* | | | | | | | | | | Merge branch 'cc/replace'Junio C Hamano2009-11-241-0/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | replace: use a GIT_NO_REPLACE_OBJECTS env variableChristian Couder2009-11-211-0/+17
* | | | | | | | | | | | t4014-format-patch: do not assume 'test' is available as non-builtinJohannes Sixt2009-11-231-4/+2
* | | | | | | | | | | | Merge branch 'bg/fetch-multi'Junio C Hamano2009-11-233-2/+184
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add missing test for 'git remote update --prune'Björn Gustavsson2009-11-101-0/+11
| * | | | | | | | | | | | Add the configuration option skipFetchAllBjörn Gustavsson2009-11-101-3/+37
| * | | | | | | | | | | | Teach the --multiple option to 'git fetch'Björn Gustavsson2009-11-101-0/+44
| * | | | | | | | | | | | Teach the --all option to 'git fetch'Björn Gustavsson2009-11-102-2/+95
* | | | | | | | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2009-11-231-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git svn: strip leading path when making empty dirsEric Wong2009-11-231-0/+23
* | | | | | | | | | | | | | Merge branch 'rj/maint-t9700'Junio C Hamano2009-11-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t9700-perl-git.sh: Fix a test failure on CygwinRamsay Jones2009-11-201-1/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ls/maint-mailinfo-no-inbody'Junio C Hamano2009-11-2314-1/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git am/mailinfo: Don't look at in-body headers when rebasingLukas Sandström2009-11-2114-1/+101
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'pb/maint-use-custom-perl'Junio C Hamano2009-11-233-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Make sure $PERL_PATH is defined when the test suite is run.Philippe Bruhat (BooK)2009-11-173-4/+4
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'bc/grep-i-F'Junio C Hamano2009-11-231-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | grep: Allow case insensitive search of fixed-stringsBrian Collins2009-11-171-0/+10
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | strbuf_add_wrapped_text(): factor out strbuf_add_indented_text()René Scharfe2009-11-231-0/+21
* | | | | | | | | | | | | | grep: unset GREP_OPTIONS before spawning external grepRené Scharfe2009-11-231-0/+5
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jh/notes' (early part)Junio C Hamano2009-11-214-0/+622
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add selftests verifying concatenation of multiple notes for the same commitJohan Herland2009-10-201-0/+84
| * | | | | | | | | | | | | Add selftests verifying that we can parse notes trees with various fanoutsJohan Herland2009-10-201-0/+104
| * | | | | | | | | | | | | t3302-notes-index-expensive: Speed up create_repo()Johan Herland2009-10-201-27/+47
| * | | | | | | | | | | | | fast-import: Add support for importing commit notesJohan Herland2009-10-201-0/+166
| * | | | | | | | | | | | | Teach "-m <msg>" and "-F <file>" to "git notes edit"Johan Herland2009-10-201-0/+36
| * | | | | | | | | | | | | Add an expensive test for git-notesJohannes Schindelin2009-10-201-0/+98
| * | | | | | | | | | | | | Add a script to edit/inspect notesJohannes Schindelin2009-10-201-0/+114
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'sp/smart-http'Junio C Hamano2009-11-216-21/+507
|\ \ \ \ \ \ \ \ \ \ \ \ \