Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/skip-http-tests-under-no-curl' | Junio C Hamano | 2015-05-22 |
|\ | |||
| * | tests: skip dav http-push tests under NO_EXPAT=NoThanks | Junio C Hamano | 2015-05-07 |
| * | t/lib-httpd.sh: skip tests if NO_CURL is defined | Jeff King | 2015-05-07 |
* | | Merge branch 'kn/cat-file-literally' | Junio C Hamano | 2015-05-19 |
|\ \ | |||
| * | | t1006: add tests for git cat-file --allow-unknown-type | Karthik Nayak | 2015-05-06 |
* | | | Merge branch 'jc/merge' | Junio C Hamano | 2015-05-19 |
|\ \ \ | |||
| * | | | merge: deprecate 'git merge <message> HEAD <commit>' syntax | Junio C Hamano | 2015-04-29 |
| * | | | merge: handle FETCH_HEAD internally | Junio C Hamano | 2015-04-29 |
| * | | | t5520: test pulling an octopus into an unborn branch | Junio C Hamano | 2015-04-29 |
| * | | | t5520: style fixes | Junio C Hamano | 2015-04-29 |
| * | | | merge: test the top-level merge driver | Junio C Hamano | 2015-04-29 |
* | | | | Merge branch 'ph/rebase-i-redo' | Junio C Hamano | 2015-05-19 |
|\ \ \ \ | |||
| * | | | | rebase -i: redo tasks that die during cherry-pick | Phil Hord | 2015-04-29 |
| * | | | | Merge branch 'tb/connect-ipv6-parse-fix' into maint | Junio C Hamano | 2015-04-27 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'jk/test-annoyances' into maint | Junio C Hamano | 2015-04-21 |
| |\ \ \ \ \ | |||
* | \ \ \ \ \ | Merge branch 'jc/test-prereq-validate' | Junio C Hamano | 2015-05-19 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | test: validate prerequistes syntax | Junio C Hamano | 2015-04-28 |
* | | | | | | | | Merge branch 'bc/connect-plink' | Junio C Hamano | 2015-05-19 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | connect: improve check for plink to reduce false positives | brian m. carlson | 2015-04-28 |
| * | | | | | | | | t5601: fix quotation error leading to skipped tests | brian m. carlson | 2015-04-28 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'jk/test-chain-lint' | Junio C Hamano | 2015-05-19 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | test-lib: turn on GIT_TEST_CHAIN_LINT by default | Jeff King | 2015-04-28 |
| * | | | | | | | | t7502-commit.sh: fix a broken and-chain | Ramsay Jones | 2015-04-28 |
* | | | | | | | | | Merge branch 'jk/stash-require-clean-index' | Junio C Hamano | 2015-05-19 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | stash: require a clean index to apply | Jeff King | 2015-04-22 |
| * | | | | | | | | | t3903: avoid applying onto dirty index | Jeff King | 2015-04-22 |
| * | | | | | | | | | t3903: stop hard-coding commit sha1s | Jeff King | 2015-04-22 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jc/gitignore-precedence' | Junio C Hamano | 2015-05-19 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | ignore: info/exclude should trump core.excludesfile | Junio C Hamano | 2015-04-22 |
* | | | | | | | | | | Merge branch 'nd/diff-i-t-a' | Junio C Hamano | 2015-05-19 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | diff-lib.c: adjust position of i-t-a entries in diff | Nguyễn Thái Ngọc Duy | 2015-03-23 |
* | | | | | | | | | | | Merge branch 'jc/hash-object' | Junio C Hamano | 2015-05-11 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | t1007: add hash-object --literally tests | Eric Sunshine | 2015-05-05 |
* | | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' | Junio C Hamano | 2015-05-11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | filter-branch: avoid passing commit message through sed | Jeff King | 2015-04-29 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' | Junio C Hamano | 2015-05-11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | blame: CRLF in the working tree and LF in the repo | Torsten Bögershausen | 2015-05-03 |
| |/ / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge branch 'va/fix-git-p4-tests' | Junio C Hamano | 2015-05-11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | git-p4: t9814: prevent --chain-lint failure | Luke Diamand | 2015-04-28 |
* | | | | | | | | | | | | | Merge branch 'ld/p4-case-fold' | Junio C Hamano | 2015-05-11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | git-p4: add failing tests for case-folding p4d | Luke Diamand | 2015-04-28 |
* | | | | | | | | | | | | | | Merge branch 'va/p4-client-path' | Junio C Hamano | 2015-05-11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | git-p4: improve client path detection when branches are used | Vitor Antunes | 2015-04-23 |
| * | | | | | | | | | | | | | | t9801: check git-p4's branch detection with client spec enabled | Vitor Antunes | 2015-04-22 |
* | | | | | | | | | | | | | | | Merge branch 'mm/add-p-split-error' | Junio C Hamano | 2015-05-11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | stash -p: demonstrate failure of split with mixed y/n | Matthieu Moy | 2015-04-16 |
| * | | | | | | | | | | | | | | | t3904-stash-patch: factor PERL prereq at the top of the file | Matthieu Moy | 2015-04-16 |
| * | | | | | | | | | | | | | | | t3904-stash-patch: fix test description | Matthieu Moy | 2015-04-16 |
| * | | | | | | | | | | | | | | | add -p: demonstrate failure when running 'edit' after a split | Matthieu Moy | 2015-04-16 |
| * | | | | | | | | | | | | | | | t3701-add-interactive: simplify code | Matthieu Moy | 2015-04-16 |
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |