summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/hooks'Junio C Hamano2016-08-191-0/+6
|\
| * rev-parse: respect core.hooksPath in --git-pathab/hooksJohannes Schindelin2016-08-161-0/+6
* | Merge branch 'jk/difftool-command-not-found'Junio C Hamano2016-08-191-0/+6
|\ \
| * | difftool: always honor fatal error exit codesjk/difftool-command-not-foundJohn Keeping2016-08-151-0/+6
* | | Merge branch 'sb/checkout-explit-detach-no-advice'Junio C Hamano2016-08-191-0/+23
|\ \ \
| * | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-adviceStefan Beller2016-08-151-0/+23
| |/ /
* | | Merge branch 'tb/t0027-raciness-fix'Junio C Hamano2016-08-191-3/+3
|\ \ \
| * | | convert: Correct NNO tests and missing `LF will be replaced by CRLF`tb/t0027-raciness-fixTorsten Bögershausen2016-08-141-3/+3
* | | | Merge branch 'rs/pull-signed-tag'Junio C Hamano2016-08-191-0/+18
|\ \ \ \
| * | | | merge-recursive: fix verbose output for multiple base treesRené Scharfe2016-08-131-0/+18
| | |/ / | |/| |
* | | | Merge branch 'js/test-lint-pathname'Junio C Hamano2016-08-171-1/+10
|\ \ \ \
| * | | | t/Makefile: ensure that paths are valid on platforms we carejs/test-lint-pathnameJohannes Schindelin2016-08-161-1/+10
| |/ / /
| * | | Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano2016-08-121-0/+14
| |\ \ \
| * \ \ \ Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano2016-08-101-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/t4205-cleanup' into maintJunio C Hamano2016-08-101-198/+200
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/fbsd-lazy-mtime' into maintJunio C Hamano2016-08-101-1/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/t4130-rename-without-ino' into maintJunio C Hamano2016-08-101-3/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/grep-commandline-vs-configuration' into maintJunio C Hamano2016-08-101-0/+14
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maintJunio C Hamano2016-08-101-0/+11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mm/status-suggest-merge-abort' into maintJunio C Hamano2016-08-102-0/+5
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/submodule-config-code-cleanup' into maintJunio C Hamano2016-08-082-1/+12
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-08-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/unpack-trees-advice-messages' into maintJunio C Hamano2016-08-083-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-081-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano2016-08-081-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-scrub-url' into maintJunio C Hamano2016-08-081-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/cache-tree-ita' into maintJunio C Hamano2016-08-0814-50/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/blame-worktree' into maintJunio C Hamano2016-08-081-17/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/reflog-past-root'Junio C Hamano2016-08-171-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | t1410: remove superfluous 'git reflog' from the 'walk past root' testsg/reflog-past-rootSZEDER Gábor2016-08-151-1/+0
* | | | | | | | | | | | | | | | | | | | | t7411: become resilient to GETTEXT_POISONVasco Almeida2016-08-121-1/+1
* | | | | | | | | | | | | | | | | | | | | t5520: become resilient to GETTEXT_POISONVasco Almeida2016-08-121-2/+2
* | | | | | | | | | | | | | | | | | | | | t3404: become resilient to GETTEXT_POISONVasco Almeida2016-08-121-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'kw/patch-ids-optim'Junio C Hamano2016-08-122-0/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | rebase: avoid computing unnecessary patch IDsKevin Willford2016-08-112-0/+57
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'vs/typofix'Junio C Hamano2016-08-129-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Spelling fixesvs/typofixVille Skyttä2016-08-119-13/+13
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-update-dot-branch'Junio C Hamano2016-08-101-9/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | t7406: fix breakage on OSXsb/submodule-update-dot-branchStefan Beller2016-08-101-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | submodule update: allow '.' for branch valueStefan Beller2016-08-031-1/+34
| * | | | | | | | | | | | | | | | | | | | | | | submodule update: respect depth in subsequent fetchesStefan Beller2016-08-011-0/+16
| * | | | | | | | | | | | | | | | | | | | | | | t7406: future proof tests with hard coded depthStefan Beller2016-08-011-8/+11
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano2016-08-101-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | t5520: verify that `pull --rebase` shows the helpful advice when failingJohannes Schindelin2016-07-261-0/+32
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/format-patch-from-config'Junio C Hamano2016-08-101-0/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | format-patch: format.from gives the default for --fromjt/format-patch-from-configJosh Triplett2016-08-011-0/+40
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-force-with-lease-creation'Junio C Hamano2016-08-101-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | t5533: make it pass on case-sensitive filesystemsjk/push-force-with-lease-creationJohannes Schindelin2016-08-041-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | push: allow pushing new branches with --force-with-leaseJohn Keeping2016-07-261-0/+12
| * | | | | | | | | | | | | | | | | | | | | | | | push: add shorthand for --force-with-lease branch creationJohn Keeping2016-07-261-0/+26