summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fast-import: don't allow to note on empty branchdi/fast-import-empty-tag-note-fixDmitry Ivankov2011-09-222-0/+19
* fast-import: don't allow to tag empty branchDmitry Ivankov2011-09-222-0/+14
* Merge branch 'di/fast-import-tagging'Junio C Hamano2011-08-282-7/+74
|\
| * fast-import: allow to tag newly created objectsDmitry Ivankov2011-08-232-3/+33
| * fast-import: add tests for tagging blobsDmitry Ivankov2011-08-232-7/+44
* | Merge branch 'di/fast-import-blob-tweak'Junio C Hamano2011-08-281-5/+12
|\ \
| * | fast-import: treat cat-blob as a delta base hint for next blobDmitry Ivankov2011-08-221-1/+6
| * | fast-import: count and report # of calls to diff_delta in statsDmitry Ivankov2011-08-221-4/+6
| |/
* | Merge branch 'di/fast-import-deltified-tree'Junio C Hamano2011-08-282-5/+71
|\ \
| * | fast-import: prevent producing bad deltaDmitry Ivankov2011-08-142-6/+31
| * | fast-import: add a test for tree delta base corruptionDmitry Ivankov2011-08-141-0/+41
| |/
* | Merge branch 'di/fast-import-ident'Junio C Hamano2011-08-285-18/+164
|\ \
| * | fsck: improve committer/author checkDmitry Ivankov2011-08-112-7/+9
| * | fsck: add a few committer name testsDmitry Ivankov2011-08-111-0/+36
| * | fast-import: check committer name more strictlyDmitry Ivankov2011-08-113-19/+24
| * | fast-import: don't fail on omitted committer nameDmitry Ivankov2011-08-112-1/+5
| * | fast-import: add input format testsDmitry Ivankov2011-08-111-0/+99
| |/
* | Merge branch 'bw/doc-repo-layout'Junio C Hamano2011-08-283-31/+34
|\ \
| * | Mark http-fetch without -a as deprecatedBen Walton2011-08-232-0/+7
| * | Documentation: Grammar correction, wording fixes and cleanupBen Walton2011-08-231-31/+27
* | | Merge branch 'va/p4-branch-import'Junio C Hamano2011-08-283-9/+284
|\ \ \
| * | | git-p4: Add simple test case for branch importVitor Antunes2011-08-221-0/+64
| * | | git-p4: Allow branch definition with git configVitor Antunes2011-08-222-0/+31
| * | | git-p4: Allow filtering Perforce branches by userVitor Antunes2011-08-222-1/+13
| * | | git-p4: Correct branch base depot path detectionVitor Antunes2011-08-221-3/+5
| * | | git-p4: Process detectCopiesHarder with --boolVitor Antunes2011-08-221-1/+1
| * | | git-p4: Add test case for copy detectionVitor Antunes2011-08-221-0/+83
| * | | git-p4: Add test case for rename detectionVitor Antunes2011-08-221-0/+53
| * | | git-p4: Add description of rename/copy detection optionsVitor Antunes2011-08-221-0/+25
| * | | git-p4: Allow setting rename/copy detection thresholdVitor Antunes2011-08-221-4/+9
* | | | Merge branch 'jc/combine-diff-callback'Junio C Hamano2011-08-282-1/+70
|\ \ \ \
| * | | | combine-diff: support format_callbackJunio C Hamano2011-08-202-1/+70
| | |_|/ | |/| |
* | | | Merge branch 'nk/branch-v-abbrev'Junio C Hamano2011-08-282-2/+6
|\ \ \ \
| * | | | branch -v: honor core.abbrevNamhyung Kim2011-07-012-2/+6
* | | | | Git 1.7.7-rc0v1.7.7-rc0Junio C Hamano2011-08-252-3/+10
* | | | | Merge branch 'jc/merge-reword'Junio C Hamano2011-08-252-4/+4
|\ \ \ \ \
| * | | | | merge: reword the final messageJunio C Hamano2011-05-252-4/+4
* | | | | | Merge branch 'mg/branch-set-upstream-previous'Junio C Hamano2011-08-252-1/+15
|\ \ \ \ \ \
| * | | | | | branch.c: use the parsed branch nameMichael J Gruber2011-08-192-1/+15
* | | | | | | Merge branch 'da/difftool-mergtool-refactor'Junio C Hamano2011-08-2518-320/+432
|\ \ \ \ \ \ \
| * | | | | | | mergetools/meld: Use '--output' when availableDavid Aguilar2011-08-191-1/+24
| * | | | | | | mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-1917-333/+369
| * | | | | | | mergetool--lib: Make style consistent with gitDavid Aguilar2011-08-191-53/+100
| * | | | | | | difftool--helper: Make style consistent with gitDavid Aguilar2011-08-191-6/+12
* | | | | | | | Merge branch 'jc/maint-autofix-tag-in-head'Junio C Hamano2011-08-251-42/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: reduce use of redundant global variablesJunio C Hamano2011-08-191-42/+45
* | | | | | | | | Merge branch 'di/fast-import-doc'Junio C Hamano2011-08-252-3/+54
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc/fast-import: document feature import-marks-if-existsDmitry Ivankov2011-08-172-3/+54
* | | | | | | | | | Merge branch 'jn/plug-empty-tree-leak'Junio C Hamano2011-08-253-12/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge-recursive: take advantage of hardcoded empty treeJonathan Nieder2011-08-161-5/+3