Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/maint-clone-gitdir' | Junio C Hamano | 2011-08-28 | 1 | -0/+4 |
|\ | |||||
| * | clone: allow to clone from .git file | Nguyễn Thái Ngọc Duy | 2011-08-22 | 1 | -0/+4 |
* | | Merge branch 'ci/forbid-unwanted-current-branch-update' | Junio C Hamano | 2011-08-28 | 2 | -0/+29 |
|\ \ | |||||
| * | | Show interpreted branch name in error messages | Conrad Irwin | 2011-08-22 | 1 | -0/+9 |
| * | | Prevent force-updating of the current branch | Conrad Irwin | 2011-08-22 | 2 | -0/+20 |
* | | | Merge branch 'jk/pager-with-external-command' | Junio C Hamano | 2011-08-28 | 1 | -0/+36 |
|\ \ \ | |||||
| * | | | support pager.* for external commands | Jeff King | 2011-08-19 | 1 | -0/+36 |
* | | | | Merge branch 'jc/maint-clone-alternates' | Junio C Hamano | 2011-08-28 | 1 | -0/+23 |
|\ \ \ \ | |||||
| * | | | | clone: clone from a repository with relative alternates | Junio C Hamano | 2011-08-23 | 1 | -1/+9 |
| * | | | | clone: allow more than one --reference | Junio C Hamano | 2011-08-22 | 1 | -0/+15 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jk/color-and-pager' | Junio C Hamano | 2011-08-28 | 2 | -23/+61 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | color: delay auto-color decision until point of use | Jeff King | 2011-08-19 | 1 | -0/+12 |
| * | | | setup_pager: set GIT_PAGER_IN_USE | Jeff King | 2011-08-18 | 1 | -0/+11 |
| * | | | t7006: use test_config helpers | Jeff King | 2011-08-18 | 1 | -21/+18 |
| * | | | test-lib: add helper functions for config | Jeff King | 2011-08-18 | 1 | -0/+18 |
| * | | | t7006: modernize calls to unset | Jeff King | 2011-08-18 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'di/fast-import-tagging' | Junio C Hamano | 2011-08-28 | 1 | -0/+67 |
|\ \ \ | |||||
| * | | | fast-import: allow to tag newly created objects | Dmitry Ivankov | 2011-08-23 | 1 | -0/+26 |
| * | | | fast-import: add tests for tagging blobs | Dmitry Ivankov | 2011-08-23 | 1 | -0/+41 |
* | | | | Merge branch 'di/fast-import-deltified-tree' | Junio C Hamano | 2011-08-28 | 1 | -0/+41 |
|\ \ \ \ | |||||
| * | | | | fast-import: prevent producing bad delta | Dmitry Ivankov | 2011-08-14 | 1 | -1/+1 |
| * | | | | fast-import: add a test for tree delta base corruption | Dmitry Ivankov | 2011-08-14 | 1 | -0/+41 |
| |/ / / | |||||
* | | | | Merge branch 'di/fast-import-ident' | Junio C Hamano | 2011-08-28 | 2 | -0/+135 |
|\ \ \ \ | |||||
| * | | | | fsck: improve committer/author check | Dmitry Ivankov | 2011-08-11 | 1 | -3/+3 |
| * | | | | fsck: add a few committer name tests | Dmitry Ivankov | 2011-08-11 | 1 | -0/+36 |
| * | | | | fast-import: check committer name more strictly | Dmitry Ivankov | 2011-08-11 | 1 | -5/+5 |
| * | | | | fast-import: don't fail on omitted committer name | Dmitry Ivankov | 2011-08-11 | 1 | -1/+1 |
| * | | | | fast-import: add input format tests | Dmitry Ivankov | 2011-08-11 | 1 | -0/+99 |
| |/ / / | |||||
* | | | | Merge branch 'va/p4-branch-import' | Junio C Hamano | 2011-08-28 | 1 | -0/+200 |
|\ \ \ \ | |||||
| * | | | | git-p4: Add simple test case for branch import | Vitor Antunes | 2011-08-22 | 1 | -0/+64 |
| * | | | | git-p4: Add test case for copy detection | Vitor Antunes | 2011-08-22 | 1 | -0/+83 |
| * | | | | git-p4: Add test case for rename detection | Vitor Antunes | 2011-08-22 | 1 | -0/+53 |
* | | | | | Merge branch 'jc/merge-reword' | Junio C Hamano | 2011-08-25 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | merge: reword the final message | Junio C Hamano | 2011-05-25 | 1 | -3/+3 |
* | | | | | | Merge branch 'mg/branch-set-upstream-previous' | Junio C Hamano | 2011-08-25 | 1 | -0/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | branch.c: use the parsed branch name | Michael J Gruber | 2011-08-19 | 1 | -0/+14 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'jk/tag-list-multiple-patterns' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+5 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jl/submodule-update-quiet' into maint | Junio C Hamano | 2011-08-16 | 1 | -2/+4 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jl/submodule-add-relurl-wo-upstream' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'js/ls-tree-error' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+24 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/fast-export-quote-path' into maint | Junio C Hamano | 2011-08-16 | 1 | -1/+27 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-reset-unmerged-path' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/submodule-sync-no-auto-vivify' into maint | Junio C Hamano | 2011-08-16 | 1 | -2/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'aw/rebase-i-p' into maint | Junio C Hamano | 2011-08-16 | 3 | -3/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/combine-diff-binary-etc' into maint | Junio C Hamano | 2011-08-16 | 1 | -0/+212 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'di/fast-import-doc' | Junio C Hamano | 2011-08-25 | 1 | -0/+47 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | doc/fast-import: document feature import-marks-if-exists | Dmitry Ivankov | 2011-08-17 | 1 | -0/+47 |
* | | | | | | | | | | | | | | | | Merge branch 'jn/plug-empty-tree-leak' | Junio C Hamano | 2011-08-25 | 1 | -1/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | revert: plug memory leak in "cherry-pick root commit" codepath | Jonathan Nieder | 2011-08-16 | 1 | -1/+26 |