Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cherry-pick/revert: add support for -X/--strategy-option | Jonathan Nieder | 2010-12-28 | 1 | -0/+14 |
* | Merge branch 'maint' | Junio C Hamano | 2010-12-22 | 1 | -1/+1 |
|\ | |||||
| * | test-lib.sh/test_decode_color(): use octal not hex in awk script | Brandon Casey | 2010-12-22 | 1 | -1/+1 |
* | | Merge branch 'rj/maint-test-fixes' | Junio C Hamano | 2010-12-22 | 4 | -23/+35 |
|\ \ | |||||
| * | | t9501-*.sh: Fix a test failure on Cygwin | Ramsay Jones | 2010-12-14 | 1 | -1/+1 |
| * | | lib-git-svn.sh: Add check for mis-configured web server variables | Ramsay Jones | 2010-12-14 | 1 | -0/+10 |
| * | | lib-git-svn.sh: Avoid setting web server variables unnecessarily | Ramsay Jones | 2010-12-14 | 1 | -22/+25 |
| * | | t9142: Move call to start_httpd into the setup test | Ramsay Jones | 2010-12-14 | 1 | -3/+2 |
| * | | t3600-rm.sh: Don't pass a non-existent prereq to test #15 | Ramsay Jones | 2010-12-14 | 1 | -1/+1 |
* | | | Merge branch 'jc/maint-am-abort-safely' | Junio C Hamano | 2010-12-22 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | am --abort: keep unrelated commits since the last failure and warn | Junio C Hamano | 2010-12-21 | 1 | -0/+9 |
* | | | | Merge branch 'jk/commit-die-on-bogus-ident' | Junio C Hamano | 2010-12-22 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | ident: die on bogus date format | Jeff King | 2010-12-20 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Merge branch 'nd/maint-fix-add-typo-detection' | Junio C Hamano | 2010-12-22 | 1 | -3/+11 |
|\ \ \ \ | |||||
| * | | | | unpack-trees: fix sparse checkout's "unable to match directories" | Nguyễn Thái Ngọc Duy | 2010-11-30 | 1 | -3/+11 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-12-21 | 2 | -4/+4 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | t0050: fix printf format strings for portability | Jonathan Nieder | 2010-12-21 | 1 | -2/+2 |
| * | | | | t3419-*.sh: Fix arithmetic expansion syntax error | Ramsay Jones | 2010-12-21 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'ks/blame-worktree-textconv-cached' | Junio C Hamano | 2010-12-21 | 1 | -0/+21 |
|\ \ \ \ | |||||
| * | | | | fill_textconv(): Don't get/put cache if sha1 is not valid | Kirill Smelkov | 2010-12-19 | 1 | -2/+1 |
| * | | | | t/t8006: Demonstrate blame is broken when cachetextconv is on | Kirill Smelkov | 2010-12-19 | 1 | -0/+22 |
| |/ / / | |||||
| * | | | use persistent memory for rejected paths | Clemens Buchacher | 2010-12-14 | 2 | -11/+24 |
| * | | | do not overwrite files in leading path | Clemens Buchacher | 2010-12-14 | 1 | -1/+1 |
| * | | | t7607: add leading-path tests | Clemens Buchacher | 2010-12-14 | 1 | -0/+51 |
| * | | | t7607: use test-lib functions and check MERGE_HEAD | Clemens Buchacher | 2010-12-14 | 1 | -23/+15 |
| * | | | Merge branch 'tc/http-urls-ends-with-slash' into maint | Junio C Hamano | 2010-12-14 | 1 | -2/+14 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/maint-reflog-bottom' into maint | Junio C Hamano | 2010-12-14 | 1 | -0/+34 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'mz/rebase-abort-reflog-fix' into maint | Junio C Hamano | 2010-12-14 | 1 | -0/+12 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'gc/http-with-non-ascii-username-url' into maint | Junio C Hamano | 2010-12-14 | 4 | -0/+40 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge branch 'jk/maint-decorate-01-bool' into maint | Junio C Hamano | 2010-12-10 | 1 | -0/+9 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'mg/maint-tag-rfc1991' into maint | Junio C Hamano | 2010-12-10 | 1 | -0/+66 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jn/cherry-pick-refresh-index' into maint | Junio C Hamano | 2010-12-09 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'fc/apply-p2-get-header-name' into maint | Junio C Hamano | 2010-12-09 | 1 | -0/+26 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ak/apply-non-git-epoch' into maint | Junio C Hamano | 2010-12-09 | 4 | -0/+28 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'cm/diff-check-at-eol' into maint | Junio C Hamano | 2010-12-09 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tc/smart-http-post-redirect' into maint | Junio C Hamano | 2010-12-09 | 2 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/require-perl-5.8' into maint | Junio C Hamano | 2010-12-09 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-orphan-merge-noclobber' into maint | Junio C Hamano | 2010-12-02 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bg/maint-gitweb-test-lib' into maint | Junio C Hamano | 2010-12-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/maint-merge-file-subdir' into maint | Junio C Hamano | 2010-12-02 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ks/no-textconv-symlink' into maint | Junio C Hamano | 2010-12-02 | 2 | -12/+88 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/fortran-userdiff' into maint | Junio C Hamano | 2010-12-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/t2107-now-passes' | Junio C Hamano | 2010-12-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | t2107: mark passing test as success | Jeff King | 2010-12-19 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/oneline-sha1-name-from-specific-ref' | Junio C Hamano | 2010-12-21 | 1 | -0/+73 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | get_sha1: support $commit^{/regex} syntax | Nguyễn Thái Ngọc Duy | 2010-12-14 | 1 | -0/+73 |
* | | | | | | | | | | | | | | | | | | | | | | t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge | Jonathan Nieder | 2010-12-19 | 1 | -35/+49 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/fast-import-blob-access' | Junio C Hamano | 2010-12-16 | 1 | -2/+265 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | t9300: avoid short reads from dd | Jonathan Nieder | 2010-12-12 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | t9300: remove unnecessary use of /dev/stdin | Junio C Hamano | 2010-12-03 | 1 | -3/+3 |