Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fast-import: don't allow to note on empty branchdi/fast-import-empty-tag-note-fix | Dmitry Ivankov | 2011-09-22 | 2 | -0/+19 |
* | fast-import: don't allow to tag empty branch | Dmitry Ivankov | 2011-09-22 | 2 | -0/+14 |
* | Merge branch 'di/fast-import-tagging' | Junio C Hamano | 2011-08-28 | 2 | -7/+74 |
|\ | |||||
| * | fast-import: allow to tag newly created objects | Dmitry Ivankov | 2011-08-23 | 2 | -3/+33 |
| * | fast-import: add tests for tagging blobs | Dmitry Ivankov | 2011-08-23 | 2 | -7/+44 |
* | | Merge branch 'di/fast-import-blob-tweak' | Junio C Hamano | 2011-08-28 | 1 | -5/+12 |
|\ \ | |||||
| * | | fast-import: treat cat-blob as a delta base hint for next blob | Dmitry Ivankov | 2011-08-22 | 1 | -1/+6 |
| * | | fast-import: count and report # of calls to diff_delta in stats | Dmitry Ivankov | 2011-08-22 | 1 | -4/+6 |
| |/ | |||||
* | | Merge branch 'di/fast-import-deltified-tree' | Junio C Hamano | 2011-08-28 | 2 | -5/+71 |
|\ \ | |||||
| * | | fast-import: prevent producing bad delta | Dmitry Ivankov | 2011-08-14 | 2 | -6/+31 |
| * | | 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 | 5 | -18/+164 |
|\ \ | |||||
| * | | fsck: improve committer/author check | Dmitry Ivankov | 2011-08-11 | 2 | -7/+9 |
| * | | 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 | 3 | -19/+24 |
| * | | fast-import: don't fail on omitted committer name | Dmitry Ivankov | 2011-08-11 | 2 | -1/+5 |
| * | | fast-import: add input format tests | Dmitry Ivankov | 2011-08-11 | 1 | -0/+99 |
| |/ | |||||
* | | Merge branch 'bw/doc-repo-layout' | Junio C Hamano | 2011-08-28 | 3 | -31/+34 |
|\ \ | |||||
| * | | Mark http-fetch without -a as deprecated | Ben Walton | 2011-08-23 | 2 | -0/+7 |
| * | | Documentation: Grammar correction, wording fixes and cleanup | Ben Walton | 2011-08-23 | 1 | -31/+27 |
* | | | Merge branch 'va/p4-branch-import' | Junio C Hamano | 2011-08-28 | 3 | -9/+284 |
|\ \ \ | |||||
| * | | | git-p4: Add simple test case for branch import | Vitor Antunes | 2011-08-22 | 1 | -0/+64 |
| * | | | git-p4: Allow branch definition with git config | Vitor Antunes | 2011-08-22 | 2 | -0/+31 |
| * | | | git-p4: Allow filtering Perforce branches by user | Vitor Antunes | 2011-08-22 | 2 | -1/+13 |
| * | | | git-p4: Correct branch base depot path detection | Vitor Antunes | 2011-08-22 | 1 | -3/+5 |
| * | | | git-p4: Process detectCopiesHarder with --bool | Vitor Antunes | 2011-08-22 | 1 | -1/+1 |
| * | | | 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 |
| * | | | git-p4: Add description of rename/copy detection options | Vitor Antunes | 2011-08-22 | 1 | -0/+25 |
| * | | | git-p4: Allow setting rename/copy detection threshold | Vitor Antunes | 2011-08-22 | 1 | -4/+9 |
* | | | | Merge branch 'jc/combine-diff-callback' | Junio C Hamano | 2011-08-28 | 2 | -1/+70 |
|\ \ \ \ | |||||
| * | | | | combine-diff: support format_callback | Junio C Hamano | 2011-08-20 | 2 | -1/+70 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'nk/branch-v-abbrev' | Junio C Hamano | 2011-08-28 | 2 | -2/+6 |
|\ \ \ \ | |||||
| * | | | | branch -v: honor core.abbrev | Namhyung Kim | 2011-07-01 | 2 | -2/+6 |
* | | | | | Git 1.7.7-rc0v1.7.7-rc0 | Junio C Hamano | 2011-08-25 | 2 | -3/+10 |
* | | | | | Merge branch 'jc/merge-reword' | Junio C Hamano | 2011-08-25 | 2 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | merge: reword the final message | Junio C Hamano | 2011-05-25 | 2 | -4/+4 |
* | | | | | | Merge branch 'mg/branch-set-upstream-previous' | Junio C Hamano | 2011-08-25 | 2 | -1/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | branch.c: use the parsed branch name | Michael J Gruber | 2011-08-19 | 2 | -1/+15 |
* | | | | | | | Merge branch 'da/difftool-mergtool-refactor' | Junio C Hamano | 2011-08-25 | 18 | -320/+432 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mergetools/meld: Use '--output' when available | David Aguilar | 2011-08-19 | 1 | -1/+24 |
| * | | | | | | | mergetool--lib: Refactor tools into separate files | David Aguilar | 2011-08-19 | 17 | -333/+369 |
| * | | | | | | | mergetool--lib: Make style consistent with git | David Aguilar | 2011-08-19 | 1 | -53/+100 |
| * | | | | | | | difftool--helper: Make style consistent with git | David Aguilar | 2011-08-19 | 1 | -6/+12 |
* | | | | | | | | Merge branch 'jc/maint-autofix-tag-in-head' | Junio C Hamano | 2011-08-25 | 1 | -42/+45 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit: reduce use of redundant global variables | Junio C Hamano | 2011-08-19 | 1 | -42/+45 |
* | | | | | | | | | Merge branch 'di/fast-import-doc' | Junio C Hamano | 2011-08-25 | 2 | -3/+54 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | doc/fast-import: document feature import-marks-if-exists | Dmitry Ivankov | 2011-08-17 | 2 | -3/+54 |
* | | | | | | | | | | Merge branch 'jn/plug-empty-tree-leak' | Junio C Hamano | 2011-08-25 | 3 | -12/+30 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | merge-recursive: take advantage of hardcoded empty tree | Jonathan Nieder | 2011-08-16 | 1 | -5/+3 |