summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* log -L: store the path instead of a diff_filespecThomas Rast2013-04-121-1/+1
* log -L: test merge of parallel modify/renameThomas Rast2013-04-123-6/+250
* t4211: pass -M to 'git log -M -L...' testThomas Rast2013-04-122-9/+49
* log -L: fix overlapping input rangesThomas Rast2013-04-054-0/+356
* log -L: :pattern:file syntax to find by funcnameThomas Rast2013-03-283-0/+174
* Implement line-history search (git log -L)Thomas Rast2013-03-2810-0/+826
* Refactor parse_locBo Yang2013-03-281-0/+6
* Merge branch 'mh/maint-ceil-absolute'Junio C Hamano2013-02-271-0/+17
|\
| * Provide a mechanism to turn off symlink resolution in ceiling pathsMichael Haggerty2013-02-221-0/+17
* | Sync with 'maint'Junio C Hamano2013-02-251-1/+1
|\ \
| * \ Merge branch 'sp/smart-http-content-type-check' into maintJunio C Hamano2013-02-254-0/+21
| |\ \
| * \ \ Merge branch 'jc/combine-diff-many-parents' into maintJunio C Hamano2013-02-251-0/+24
| |\ \ \
| * | | | Documentation: "advice" is uncountableGreg Price2013-02-251-1/+1
| * | | | Merge branch 'mz/pick-unborn' into maintJunio C Hamano2013-02-079-40/+32
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/fix-perf-parameters-in-tests' into maintJunio C Hamano2013-02-071-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into...Junio C Hamano2013-02-071-1/+24
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano2013-02-071-2/+28
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'bc/git-p4-for-python-2.4' into maintJunio C Hamano2013-02-041-5/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/merge-blobs' into maintJunio C Hamano2013-02-041-0/+44
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'as/check-ignore'Junio C Hamano2013-02-251-0/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | name-hash: allow hashing an empty stringJunio C Hamano2013-02-191-0/+5
| * | | | | | | | | | | t0008: document test_expect_success_multiAdam Spiers2013-02-191-0/+10
* | | | | | | | | | | | Merge branch 'jc/hidden-refs'Junio C Hamano2013-02-172-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | upload/receive-pack: allow hiding ref hierarchiesJunio C Hamano2013-02-072-0/+39
* | | | | | | | | | | | | Merge branch 'mw/bash-prompt-show-untracked-config'Junio C Hamano2013-02-171-1/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t9903: add extra tests for bash.showDirtyStateMartin Erik Werner2013-02-131-1/+37
| * | | | | | | | | | | | | t9903: add tests for bash.showUntrackedFilesMartin Erik Werner2013-02-131-0/+40
* | | | | | | | | | | | | | Merge branch 'jk/rebase-i-comment-char'Junio C Hamano2013-02-171-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase -i: respect core.commentcharJohn Keeping2013-02-121-0/+14
* | | | | | | | | | | | | | | Merge branch 'jk/read-commit-buffer-data-after-free'Junio C Hamano2013-02-171-0/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | log: re-encode commit messages before greppingJeff King2013-02-111-0/+58
* | | | | | | | | | | | | | | | Merge branch 'nd/status-show-in-progress'Junio C Hamano2013-02-141-35/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | status: show the branch name if possible in in-progress infoNguyễn Thái Ngọc Duy2013-02-051-35/+52
* | | | | | | | | | | | | | | | Merge branch 'sp/smart-http-content-type-check'Junio C Hamano2013-02-104-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | t5551: fix expected error outputJunio C Hamano2013-02-041-2/+1
| * | | | | | | | | | | | | | | Verify Content-Type from smart HTTP serversShawn Pearce2013-02-044-0/+22
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'tb/t0050-maint' into maintJunio C Hamano2013-01-301-35/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/status-ignored-in-ignored-directory' into maintJunio C Hamano2013-01-281-0/+146
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/ceiling' into maintJunio C Hamano2013-01-282-58/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/combine-diff-many-parents'Junio C Hamano2013-02-081-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | t4038: add tests for "diff --cc --raw <trees>"John Keeping2013-02-051-0/+24
* | | | | | | | | | | | | | | | | | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-02-072-2/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | branch: let branch filters imply --listJeff King2013-01-311-0/+35
| * | | | | | | | | | | | | | | | | | branch: give a more helpful message on redundant argumentsNguyễn Thái Ngọc Duy2013-01-301-2/+2
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano2013-02-051-2/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | git-am: record full index line in the patch used while rebasingJunio C Hamano2013-01-311-2/+28
* | | | | | | | | | | | | | | | | | | Merge branch 'pw/git-p4-on-cygwin'Junio C Hamano2013-02-049-66/+252
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git p4 test: use test_chmod for cygwinPete Wyckoff2013-01-261-4/+7
| * | | | | | | | | | | | | | | | | | | git p4: cygwin p4 client does not mark read-onlyPete Wyckoff2013-01-263-4/+27
| * | | | | | | | | | | | | | | | | | | git p4 test: avoid wildcard * in windowsPete Wyckoff2013-01-262-10/+37