aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Sync with 1.8.1.5Junio C Hamano2013-03-01
|\
| * Make !pattern in .gitattributes non-fatalThomas Rast2013-03-01
* | Merge branch 'mh/maint-ceil-absolute'Junio C Hamano2013-02-27
|\ \
| * | Provide a mechanism to turn off symlink resolution in ceiling pathsMichael Haggerty2013-02-22
* | | Sync with 'maint'Junio C Hamano2013-02-25
|\ \ \ | | |/ | |/|
| * | Merge branch 'sp/smart-http-content-type-check' into maintJunio C Hamano2013-02-25
| |\ \
| * \ \ Merge branch 'jc/combine-diff-many-parents' into maintJunio C Hamano2013-02-25
| |\ \ \
| * | | | Documentation: "advice" is uncountableGreg Price2013-02-25
| * | | | Merge branch 'mz/pick-unborn' into maintJunio C Hamano2013-02-07
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/fix-perf-parameters-in-tests' into maintJunio C Hamano2013-02-07
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into...Junio C Hamano2013-02-07
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano2013-02-07
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'bc/git-p4-for-python-2.4' into maintJunio C Hamano2013-02-04
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/merge-blobs' into maintJunio C Hamano2013-02-04
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'as/check-ignore'Junio C Hamano2013-02-25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | name-hash: allow hashing an empty stringJunio C Hamano2013-02-19
| * | | | | | | | | | | t0008: document test_expect_success_multiAdam Spiers2013-02-19
* | | | | | | | | | | | Merge branch 'jc/hidden-refs'Junio C Hamano2013-02-17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | upload/receive-pack: allow hiding ref hierarchiesJunio C Hamano2013-02-07
* | | | | | | | | | | | | Merge branch 'mw/bash-prompt-show-untracked-config'Junio C Hamano2013-02-17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t9903: add extra tests for bash.showDirtyStateMartin Erik Werner2013-02-13
| * | | | | | | | | | | | | t9903: add tests for bash.showUntrackedFilesMartin Erik Werner2013-02-13
* | | | | | | | | | | | | | Merge branch 'jk/rebase-i-comment-char'Junio C Hamano2013-02-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase -i: respect core.commentcharJohn Keeping2013-02-12
* | | | | | | | | | | | | | | Merge branch 'jk/read-commit-buffer-data-after-free'Junio C Hamano2013-02-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | log: re-encode commit messages before greppingJeff King2013-02-11
* | | | | | | | | | | | | | | | Merge branch 'nd/status-show-in-progress'Junio C Hamano2013-02-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | status: show the branch name if possible in in-progress infoNguyễn Thái Ngọc Duy2013-02-05
* | | | | | | | | | | | | | | | Merge branch 'sp/smart-http-content-type-check'Junio C Hamano2013-02-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | t5551: fix expected error outputJunio C Hamano2013-02-04
| * | | | | | | | | | | | | | | Verify Content-Type from smart HTTP serversShawn Pearce2013-02-04
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'tb/t0050-maint' into maintJunio C Hamano2013-01-30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/status-ignored-in-ignored-directory' into maintJunio C Hamano2013-01-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/ceiling' into maintJunio C Hamano2013-01-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/combine-diff-many-parents'Junio C Hamano2013-02-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | t4038: add tests for "diff --cc --raw <trees>"John Keeping2013-02-05
* | | | | | | | | | | | | | | | | | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-02-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | branch: let branch filters imply --listJeff King2013-01-31
| * | | | | | | | | | | | | | | | | | branch: give a more helpful message on redundant argumentsNguyễn Thái Ngọc Duy2013-01-30
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano2013-02-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | git-am: record full index line in the patch used while rebasingJunio C Hamano2013-01-31
* | | | | | | | | | | | | | | | | | | Merge branch 'pw/git-p4-on-cygwin'Junio C Hamano2013-02-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git p4 test: use test_chmod for cygwinPete Wyckoff2013-01-26
| * | | | | | | | | | | | | | | | | | | git p4: cygwin p4 client does not mark read-onlyPete Wyckoff2013-01-26
| * | | | | | | | | | | | | | | | | | | git p4 test: avoid wildcard * in windowsPete Wyckoff2013-01-26
| * | | | | | | | | | | | | | | | | | | git p4 test: use LineEnd unix in windows tests tooPete Wyckoff2013-01-26
| * | | | | | | | | | | | | | | | | | | git p4 test: newline handlingPete Wyckoff2013-01-26
| * | | | | | | | | | | | | | | | | | | git p4 test: translate windows paths for cygwinPete Wyckoff2013-01-26
| * | | | | | | | | | | | | | | | | | | git p4 test: start p4d inside its db dirPete Wyckoff2013-01-26
| * | | | | | | | | | | | | | | | | | | git p4 test: use client_view in t9806Pete Wyckoff2013-01-26