summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-2821-147/+176
|\
| * want_color: automatically fallback to color.uiJeff King2011-08-199-44/+6
| * diff: don't load color config in plumbingJeff King2011-08-193-3/+16
| * config: refactor get_colorbool functionJeff King2011-08-191-2/+3
| * color: delay auto-color decision until point of useJeff King2011-08-1911-19/+59
| * git_config_colorbool: refactor stdout_is_tty handlingJeff King2011-08-189-29/+27
| * diff: refactor COLOR_DIFF from a flag into an intJeff King2011-08-187-34/+29
| * setup_pager: set GIT_PAGER_IN_USEJeff King2011-08-182-7/+12
| * t7006: use test_config helpersJeff King2011-08-181-21/+18
| * test-lib: add helper functions for configJeff King2011-08-181-0/+18
| * t7006: modernize calls to unsetJeff King2011-08-181-2/+2
* | Merge branch 'mh/attr'Junio C Hamano2011-08-281-50/+63
|\ \
| * | Unroll the loop over passesMichael Haggerty2011-08-141-25/+26
| * | Change while loop into for loopMichael Haggerty2011-08-141-4/+1
| * | Determine the start of the states outside of the pass loopMichael Haggerty2011-08-141-3/+5
| * | Change parse_attr() to take a pointer to struct attr_stateMichael Haggerty2011-08-141-6/+11
| * | Increment num_attr in parse_attr_line(), not parse_attr()Michael Haggerty2011-08-141-4/+4
| * | Document struct match_attrMichael Haggerty2011-08-141-0/+14
| * | Add a file commentMichael Haggerty2011-08-141-16/+10
* | | 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
|\ \ \ \ \ \