Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2013-03-09 | 1 | -1/+1 |
|\ | |||||
| * | perf: update documentation of GIT_PERF_REPEAT_COUNT | Antoine Pelisse | 2013-03-09 | 1 | -1/+1 |
| * | Merge branch 'mh/maint-ceil-absolute' into maint | Junio C Hamano | 2013-03-07 | 1 | -0/+17 |
| |\ | |||||
* | \ | Sync with 1.8.1.5 | Junio C Hamano | 2013-03-01 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Make !pattern in .gitattributes non-fatal | Thomas Rast | 2013-03-01 | 1 | -1/+2 |
* | | | Merge branch 'mh/maint-ceil-absolute' | Junio C Hamano | 2013-02-27 | 1 | -0/+17 |
|\ \ \ | | |/ | |/| | |||||
| * | | Provide a mechanism to turn off symlink resolution in ceiling paths | Michael Haggerty | 2013-02-22 | 1 | -0/+17 |
* | | | Sync with 'maint' | Junio C Hamano | 2013-02-25 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'sp/smart-http-content-type-check' into maint | Junio C Hamano | 2013-02-25 | 4 | -0/+21 |
| |\ \ | |||||
| * \ \ | Merge branch 'jc/combine-diff-many-parents' into maint | Junio C Hamano | 2013-02-25 | 1 | -0/+24 |
| |\ \ \ | |||||
| * | | | | Documentation: "advice" is uncountable | Greg Price | 2013-02-25 | 1 | -1/+1 |
| * | | | | Merge branch 'mz/pick-unborn' into maint | Junio C Hamano | 2013-02-07 | 9 | -40/+32 |
| |\ \ \ \ | |||||
| * \ \ \ \ | 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 |