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