Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Extend merge-subtree tests to test -Xsubtree=dir. | Avery Pennarun | 2010-01-18 | 1 | -1/+46 |
* | Teach git-pull to pass -X<option> to git-merge | Avery Pennarun | 2010-01-18 | 1 | -0/+8 |
* | git merge -X<option> | Avery Pennarun | 2010-01-18 | 1 | -0/+56 |
* | Merge branch 'maint' | Junio C Hamano | 2009-11-27 | 1 | -0/+17 |
|\ | |||||
| * | builtin-apply.c: pay attention to -p<n> when determining the name | Junio C Hamano | 2009-11-27 | 1 | -0/+17 |
| * | Merge branch 'jk/maint-add-p-empty' into maint | Junio C Hamano | 2009-11-16 | 1 | -0/+17 |
| |\ | |||||
| * \ | Merge branch 'js/maint-diff-color-words' into maint | Junio C Hamano | 2009-11-16 | 1 | -0/+20 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/maint-format-patch-p-suppress-stat' into maint | Junio C Hamano | 2009-11-16 | 1 | -0/+21 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/maint-1.6.3-ls-files-i' into maint | Junio C Hamano | 2009-11-16 | 1 | -0/+8 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/maint-blank-at-eof' into maint | Junio C Hamano | 2009-11-16 | 3 | -3/+110 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'maint-1.6.4' into maint | Junio C Hamano | 2009-10-25 | 1 | -0/+32 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4 | Junio C Hamano | 2009-10-25 | 1 | -0/+32 |
| | |\ \ \ \ \ \ | |||||
* | | | | | | | | | t1200: fix a timing dependent error | Nanako Shiraishi | 2009-11-25 | 1 | -3/+7 |
* | | | | | | | | | Merge branch 'jc/log-stdin' | Junio C Hamano | 2009-11-24 | 1 | -0/+61 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add trivial tests for --stdin option to log family | Junio C Hamano | 2009-11-23 | 1 | -0/+61 |
* | | | | | | | | | | Merge branch 'mr/gitweb-snapshot' | Junio C Hamano | 2009-11-24 | 3 | -1/+169 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t/gitweb-lib: Split HTTP response with non-GNU sed | Brian Gernhardt | 2009-11-24 | 1 | -2/+12 |
| * | | | | | | | | | | gitweb: Smarter snapshot names | Mark Rada | 2009-11-09 | 1 | -5/+33 |
| * | | | | | | | | | | gitweb: Document current snapshot rules via new tests | Jakub Narebski | 2009-11-09 | 1 | -0/+87 |
| * | | | | | | | | | | t/gitweb-lib.sh: Split gitweb output into headers and body | Jakub Narebski | 2009-10-31 | 1 | -1/+5 |
| * | | | | | | | | | | gitweb: check given hash before trying to create snapshot | Mark Rada | 2009-09-29 | 1 | -0/+39 |
* | | | | | | | | | | | Merge branch 'cc/replace' | Junio C Hamano | 2009-11-24 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | replace: use a GIT_NO_REPLACE_OBJECTS env variable | Christian Couder | 2009-11-21 | 1 | -0/+17 |
* | | | | | | | | | | | | t4014-format-patch: do not assume 'test' is available as non-builtin | Johannes Sixt | 2009-11-23 | 1 | -4/+2 |
* | | | | | | | | | | | | Merge branch 'bg/fetch-multi' | Junio C Hamano | 2009-11-23 | 3 | -2/+184 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add missing test for 'git remote update --prune' | Björn Gustavsson | 2009-11-10 | 1 | -0/+11 |
| * | | | | | | | | | | | | Add the configuration option skipFetchAll | Björn Gustavsson | 2009-11-10 | 1 | -3/+37 |
| * | | | | | | | | | | | | Teach the --multiple option to 'git fetch' | Björn Gustavsson | 2009-11-10 | 1 | -0/+44 |
| * | | | | | | | | | | | | Teach the --all option to 'git fetch' | Björn Gustavsson | 2009-11-10 | 2 | -2/+95 |
* | | | | | | | | | | | | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2009-11-23 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | git svn: strip leading path when making empty dirs | Eric Wong | 2009-11-23 | 1 | -0/+23 |
* | | | | | | | | | | | | | | Merge branch 'rj/maint-t9700' | Junio C Hamano | 2009-11-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t9700-perl-git.sh: Fix a test failure on Cygwin | Ramsay Jones | 2009-11-20 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'ls/maint-mailinfo-no-inbody' | Junio C Hamano | 2009-11-23 | 14 | -1/+101 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | git am/mailinfo: Don't look at in-body headers when rebasing | Lukas Sandström | 2009-11-21 | 14 | -1/+101 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'pb/maint-use-custom-perl' | Junio C Hamano | 2009-11-23 | 3 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Make sure $PERL_PATH is defined when the test suite is run. | Philippe Bruhat (BooK) | 2009-11-17 | 3 | -4/+4 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'bc/grep-i-F' | Junio C Hamano | 2009-11-23 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | grep: Allow case insensitive search of fixed-strings | Brian Collins | 2009-11-17 | 1 | -0/+10 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | strbuf_add_wrapped_text(): factor out strbuf_add_indented_text() | René Scharfe | 2009-11-23 | 1 | -0/+21 |
* | | | | | | | | | | | | | | grep: unset GREP_OPTIONS before spawning external grep | René Scharfe | 2009-11-23 | 1 | -0/+5 |
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jh/notes' (early part) | Junio C Hamano | 2009-11-21 | 4 | -0/+622 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add selftests verifying concatenation of multiple notes for the same commit | Johan Herland | 2009-10-20 | 1 | -0/+84 |
| * | | | | | | | | | | | | | Add selftests verifying that we can parse notes trees with various fanouts | Johan Herland | 2009-10-20 | 1 | -0/+104 |
| * | | | | | | | | | | | | | t3302-notes-index-expensive: Speed up create_repo() | Johan Herland | 2009-10-20 | 1 | -27/+47 |
| * | | | | | | | | | | | | | fast-import: Add support for importing commit notes | Johan Herland | 2009-10-20 | 1 | -0/+166 |
| * | | | | | | | | | | | | | Teach "-m <msg>" and "-F <file>" to "git notes edit" | Johan Herland | 2009-10-20 | 1 | -0/+36 |
| * | | | | | | | | | | | | | Add an expensive test for git-notes | Johannes Schindelin | 2009-10-20 | 1 | -0/+98 |
| * | | | | | | | | | | | | | Add a script to edit/inspect notes | Johannes Schindelin | 2009-10-20 | 1 | -0/+114 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'sp/smart-http' | Junio C Hamano | 2009-11-21 | 6 | -21/+507 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |