Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2009-03-28 | 2 | -9/+1 |
|\ | |||||
| * | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-03-28 | 2 | -9/+1 |
| |\ | |||||
| | * | test-lib: Clean up comments and Makefile. | Emil Sit | 2009-03-28 | 2 | -9/+1 |
| | * | Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1 | Junio C Hamano | 2009-03-22 | 2 | -19/+20 |
| | |\ | |||||
| | * \ | Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1 | Junio C Hamano | 2009-03-22 | 1 | -0/+17 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-03-13 | 2 | -1/+33 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0 | Junio C Hamano | 2009-03-13 | 21 | -2/+209 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0 | Junio C Hamano | 2009-03-13 | 1 | -0/+25 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0 | Junio C Hamano | 2009-03-13 | 1 | -1/+8 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0 | Junio C Hamano | 2009-03-13 | 1 | -0/+18 |
| | | |\ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ | Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1 | Junio C Hamano | 2009-03-13 | 1 | -0/+26 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1 | Junio C Hamano | 2009-03-13 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1 | Junio C Hamano | 2009-03-13 | 1 | -1/+49 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1 | Junio C Hamano | 2009-03-13 | 1 | -0/+26 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.1-allow-uninteresting-missing' into maint-1.6.1 | Junio C Hamano | 2009-03-13 | 1 | -0/+37 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1 | Junio C Hamano | 2009-03-13 | 21 | -2/+209 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'tr/maint-1.6.0-send-email-irt' into maint | Junio C Hamano | 2009-03-22 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/maint-submodule-normalize-path' into maint | Junio C Hamano | 2009-03-22 | 1 | -0/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/rsync-local' into maint | Junio C Hamano | 2009-03-22 | 1 | -19/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maint | Junio C Hamano | 2009-03-22 | 1 | -0/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/maint-send-email' into maint | Junio C Hamano | 2009-03-11 | 1 | -25/+167 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fg/maint-exclude-bq' into maint | Junio C Hamano | 2009-03-11 | 1 | -1/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' | Junio C Hamano | 2009-03-28 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | diff --cached: do not borrow from a work tree when a path is marked as assume... | Junio C Hamano | 2009-03-22 | 1 | -0/+8 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/reflog-date' | Junio C Hamano | 2009-03-26 | 1 | -0/+67 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | make oneline reflog dates more consistent with multiline format | Jeff King | 2009-03-20 | 1 | -0/+67 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/attributes-checkout' | Junio C Hamano | 2009-03-26 | 1 | -0/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Add a test for checking whether gitattributes is honored by checkout. | Kristian Amlie | 2009-03-20 | 1 | -0/+31 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-diff-temp-smudge' | Junio C Hamano | 2009-03-26 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | Smudge the files fed to external diff and textconv | Johannes Schindelin | 2009-03-22 | 1 | -0/+16 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' | Junio C Hamano | 2009-03-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | git-branch: display "was sha1" on branch deletion rather than just "sha1" | Brandon Casey | 2009-03-22 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | fast-export: Avoid dropping files from commits | Elijah Newren | 2009-03-26 | 1 | -2/+5 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'for-junio' of git://repo.or.cz/git/mingw/j6t | Junio C Hamano | 2009-03-25 | 3 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | t7502-commit: Skip SIGTERM test on Windows | Johannes Sixt | 2009-03-25 | 2 | -1/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t7005-editor: Use $SHELL_PATH in the editor scripts | Johannes Sixt | 2009-03-25 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/windows-tests' | Junio C Hamano | 2009-03-24 | 52 | -288/+594 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | t0060: fix whitespace in "wc -c" invocation | Jeff King | 2009-03-23 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t5503: GIT_DEBUG_SEND_PACK is not supported on MinGW | Johannes Sixt | 2009-03-22 | 1 | -0/+7 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t7004: Use prerequisite tags to skip tests that need gpg | Johannes Sixt | 2009-03-22 | 1 | -49/+48 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Use prerequisites to skip tests that need unzip | Johannes Sixt | 2009-03-22 | 2 | -11/+11 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t3700: Skip a test with backslashes in pathspec | Johannes Sixt | 2009-03-22 | 2 | -1/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Skip tests that require a filesystem that obeys POSIX permissions | Johannes Sixt | 2009-03-22 | 6 | -19/+23 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t0060: Fix tests on Windows | Johannes Sixt | 2009-03-22 | 1 | -33/+83 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Use prerequisite tags to skip tests that depend on symbolic links | Johannes Sixt | 2009-03-22 | 32 | -76/+211 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t9100, t9129: Use prerequisite tags for UTF-8 tests | Johannes Sixt | 2009-03-22 | 2 | -31/+28 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t5302: Use prerequisite tags to skip 64-bit offset tests | Johannes Sixt | 2009-03-22 | 1 | -10/+5 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Skip tests that fail if the executable bit is not handled by the filesystem | Johannes Sixt | 2009-03-22 | 5 | -20/+42 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t3600: Use test prerequisite tags | Johannes Sixt | 2009-03-22 | 1 | -28/+30 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | test-lib: Infrastructure to test and check for prerequisites | Johannes Sixt | 2009-03-21 | 2 | -5/+54 |