Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'nd/fix-perf-parameters-in-tests' into maint | Junio C Hamano | 2013-02-07 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into... | Junio C Hamano | 2013-02-07 | 1 | -1/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/fake-ancestor-with-non-blobs' into maint | Junio C Hamano | 2013-02-07 | 1 | -2/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/git-p4-for-python-2.4' into maint | Junio C Hamano | 2013-02-04 | 1 | -5/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/merge-blobs' into maint | Junio C Hamano | 2013-02-04 | 1 | -0/+44 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'as/check-ignore' | Junio C Hamano | 2013-02-25 | 1 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | name-hash: allow hashing an empty string | Junio C Hamano | 2013-02-19 | 1 | -0/+5 | |
| * | | | | | | | | | | | | | | | | | | | | t0008: document test_expect_success_multi | Adam Spiers | 2013-02-19 | 1 | -0/+10 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/hidden-refs' | Junio C Hamano | 2013-02-17 | 2 | -0/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | upload/receive-pack: allow hiding ref hierarchies | Junio C Hamano | 2013-02-07 | 2 | -0/+39 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'mw/bash-prompt-show-untracked-config' | Junio C Hamano | 2013-02-17 | 1 | -1/+77 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | t9903: add extra tests for bash.showDirtyState | Martin Erik Werner | 2013-02-13 | 1 | -1/+37 | |
| * | | | | | | | | | | | | | | | | | | | | | t9903: add tests for bash.showUntrackedFiles | Martin Erik Werner | 2013-02-13 | 1 | -0/+40 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rebase-i-comment-char' | Junio C Hamano | 2013-02-17 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | rebase -i: respect core.commentchar | John Keeping | 2013-02-12 | 1 | -0/+14 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/read-commit-buffer-data-after-free' | Junio C Hamano | 2013-02-17 | 1 | -0/+58 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | log: re-encode commit messages before grepping | Jeff King | 2013-02-11 | 1 | -0/+58 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/status-show-in-progress' | Junio C Hamano | 2013-02-14 | 1 | -35/+52 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | status: show the branch name if possible in in-progress info | Nguyễn Thái Ngọc Duy | 2013-02-05 | 1 | -35/+52 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sp/smart-http-content-type-check' | Junio C Hamano | 2013-02-10 | 4 | -0/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | t5551: fix expected error output | Junio C Hamano | 2013-02-04 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | Verify Content-Type from smart HTTP servers | Shawn Pearce | 2013-02-04 | 4 | -0/+22 | |
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/t0050-maint' into maint | Junio C Hamano | 2013-01-30 | 1 | -35/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ap/status-ignored-in-ignored-directory' into maint | Junio C Hamano | 2013-01-28 | 1 | -0/+146 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/ceiling' into maint | Junio C Hamano | 2013-01-28 | 2 | -58/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/combine-diff-many-parents' | Junio C Hamano | 2013-02-08 | 1 | -0/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | t4038: add tests for "diff --cc --raw <trees>" | John Keeping | 2013-02-05 | 1 | -0/+24 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/branch-error-cases' | Junio C Hamano | 2013-02-07 | 2 | -2/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | branch: let branch filters imply --list | Jeff King | 2013-01-31 | 1 | -0/+35 | |
| * | | | | | | | | | | | | | | | | | | | | | | | branch: give a more helpful message on redundant arguments | Nguyễn Thái Ngọc Duy | 2013-01-30 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs' | Junio C Hamano | 2013-02-05 | 1 | -2/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | git-am: record full index line in the patch used while rebasing | Junio C Hamano | 2013-01-31 | 1 | -2/+28 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/git-p4-on-cygwin' | Junio C Hamano | 2013-02-04 | 9 | -66/+252 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4 test: use test_chmod for cygwin | Pete Wyckoff | 2013-01-26 | 1 | -4/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4: cygwin p4 client does not mark read-only | Pete Wyckoff | 2013-01-26 | 3 | -4/+27 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4 test: avoid wildcard * in windows | Pete Wyckoff | 2013-01-26 | 2 | -10/+37 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4 test: use LineEnd unix in windows tests too | Pete Wyckoff | 2013-01-26 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4 test: newline handling | Pete Wyckoff | 2013-01-26 | 1 | -0/+117 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4 test: translate windows paths for cygwin | Pete Wyckoff | 2013-01-26 | 3 | -3/+26 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4 test: start p4d inside its db dir | Pete Wyckoff | 2013-01-26 | 1 | -2/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4 test: use client_view in t9806 | Pete Wyckoff | 2013-01-26 | 2 | -30/+23 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4 test: avoid loop in client_view | Pete Wyckoff | 2013-01-26 | 2 | -4/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4 test: use client_view to build the initial client | Pete Wyckoff | 2013-01-26 | 1 | -9/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4: generate better error message for bad depot path | Pete Wyckoff | 2013-01-26 | 1 | -0/+5 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/read-commit-buffer-data-after-free' | Junio C Hamano | 2013-02-04 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | logmsg_reencode: lazily load missing commit buffers | Jeff King | 2013-01-26 | 1 | -0/+8 | |
| |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-parsing-cleanup' | Junio C Hamano | 2013-02-04 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | archive-tar: use parse_config_key when parsing config | Jeff King | 2013-01-23 | 1 | -1/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/custom-comment-char' | Junio C Hamano | 2013-02-04 | 3 | -0/+92 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | / / / / / / / / / / / / / | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Allow custom "comment char" | Junio C Hamano | 2013-01-16 | 3 | -0/+92 |