Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/libperl-git-config' | Junio C Hamano | 2011-10-26 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add simple test for Git::config_path() in t/t9700-perl-git.sh | Jakub Narebski | 2011-10-21 | 2 | -1/+9 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cn/fetch-prune' | Junio C Hamano | 2011-10-26 | 1 | -0/+50 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch: treat --tags like refs/tags/*:refs/tags/* when pruning | Carlos MartÃn Nieto | 2011-10-15 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch: honor the user-provided refspecs when pruning refs | Carlos MartÃn Nieto | 2011-10-15 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5510: add tests for fetch --prune | Carlos MartÃn Nieto | 2011-10-07 | 1 | -0/+50 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/p4-update' | Junio C Hamano | 2011-10-21 | 5 | -324/+731 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: handle files with shell metacharacters | Luke Diamand | 2011-10-17 | 1 | -0/+64 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: handle utf16 filetype properly | Pete Wyckoff | 2011-10-17 | 1 | -0/+108 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4 tests: refactor and cleanup | Pete Wyckoff | 2011-10-17 | 3 | -324/+559 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sc/difftool-skip' | Junio C Hamano | 2011-10-21 | 1 | -1/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: avoid arithmetic expansion notationsc/difftool-skip | Junio C Hamano | 2011-10-14 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-difftool: allow skipping file by typing 'n' at prompt | Sitaram Chamarty | 2011-10-10 | 1 | -1/+42 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ph/transport-with-gitfile' | Junio C Hamano | 2011-10-21 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test showing git-fetch groks gitfiles | Phil Hord | 2011-10-04 | 1 | -0/+14 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: add missing executable bits | Jeff King | 2011-10-20 | 2 | -0/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir script | Brandon Casey | 2011-10-19 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/merge-edit-option' | Junio C Hamano | 2011-10-19 | 1 | -0/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach merge the '[-e|--edit]' option | Jay Soffian | 2011-10-12 | 1 | -0/+23 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/diff-whole-function' | Junio C Hamano | 2011-10-19 | 1 | -0/+92 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: add option to show whole functions as contextrs/diff-whole-function | René Scharfe | 2011-10-10 | 1 | -0/+92 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/no-cherry-pick-head-after-punted' | Junio C Hamano | 2011-10-19 | 1 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi... | Junio C Hamano | 2011-10-06 | 1 | -0/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so | Jay Soffian | 2011-10-06 | 1 | -0/+15 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bk/submodule-in-recursive-merge' | Junio C Hamano | 2011-10-19 | 1 | -0/+51 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: Search for merges only at end of recursive merge | Brad King | 2011-10-13 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: Demonstrate known breakage during recursive merge | Brad King | 2011-10-13 | 1 | -0/+51 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' | Junio C Hamano | 2011-10-19 | 1 | -0/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix "git apply --index ..." not to deref NULL | Jim Meyering | 2011-10-12 | 1 | -0/+43 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-test-cleanup' | Junio C Hamano | 2011-10-19 | 1 | -12/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1300: attempting to remove a non-existent .git/config is not an error | Johannes Sixt | 2011-10-19 | 1 | -12/+7 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/httpd-test-fix-port' | Junio C Hamano | 2011-10-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use test number as port numbercb/httpd-test-fix-port | Clemens Buchacher | 2011-10-17 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/mingw-misc-fixes' | Junio C Hamano | 2011-10-18 | 4 | -20/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9901: fix line-ending dependency on windows | Pat Thoyts | 2011-10-15 | 1 | -15/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9300: do not run --cat-blob-fd related tests on MinGW | Johannes Schindelin | 2011-10-14 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9001: do not fail only due to CR/LF issues | Johannes Schindelin | 2011-10-14 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1020: disable the pwd test on MinGW | Johannes Schindelin | 2011-10-14 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/http-auth' | Junio C Hamano | 2011-10-17 | 2 | -8/+53 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http: use hostname in credential description | Michael J Gruber | 2011-10-15 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve httpd auth tests | Jeff King | 2011-07-20 | 2 | -8/+53 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/check-ref-format-test-mingw' | Junio C Hamano | 2011-10-17 | 1 | -36/+52 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1402-check-ref-format: skip tests of refs beginning with slash on Windows | Johannes Sixt | 2011-10-13 | 1 | -36/+52 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-test-cleanup' | Junio C Hamano | 2011-10-17 | 1 | -83/+120 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1300: test mixed-case variable retrieval | Jeff King | 2011-10-12 | 1 | -0/+27 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1300: put git invocations inside test function | Jeff King | 2011-10-12 | 1 | -83/+93 | |
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/attr-ignore-case' | Junio C Hamano | 2011-10-17 | 1 | -1/+58 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attr.c: respect core.ignorecase when matching attribute patterns | Brandon Casey | 2011-10-11 | 1 | -1/+58 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/maint-config-explicit-bool-display' | Junio C Hamano | 2011-10-17 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config: display key_delim for config --bool --get-regexp | Matthieu Moy | 2011-10-10 | 1 | -0/+6 | |
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |