Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/color-and-pager' | Junio C Hamano | 2011-08-28 | 21 | -147/+176 |
|\ | |||||
| * | want_color: automatically fallback to color.ui | Jeff King | 2011-08-19 | 9 | -44/+6 |
| * | diff: don't load color config in plumbing | Jeff King | 2011-08-19 | 3 | -3/+16 |
| * | config: refactor get_colorbool function | Jeff King | 2011-08-19 | 1 | -2/+3 |
| * | color: delay auto-color decision until point of use | Jeff King | 2011-08-19 | 11 | -19/+59 |
| * | git_config_colorbool: refactor stdout_is_tty handling | Jeff King | 2011-08-18 | 9 | -29/+27 |
| * | diff: refactor COLOR_DIFF from a flag into an int | Jeff King | 2011-08-18 | 7 | -34/+29 |
| * | setup_pager: set GIT_PAGER_IN_USE | Jeff King | 2011-08-18 | 2 | -7/+12 |
| * | 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 'mh/attr' | Junio C Hamano | 2011-08-28 | 1 | -50/+63 |
|\ \ | |||||
| * | | Unroll the loop over passes | Michael Haggerty | 2011-08-14 | 1 | -25/+26 |
| * | | Change while loop into for loop | Michael Haggerty | 2011-08-14 | 1 | -4/+1 |
| * | | Determine the start of the states outside of the pass loop | Michael Haggerty | 2011-08-14 | 1 | -3/+5 |
| * | | Change parse_attr() to take a pointer to struct attr_state | Michael Haggerty | 2011-08-14 | 1 | -6/+11 |
| * | | Increment num_attr in parse_attr_line(), not parse_attr() | Michael Haggerty | 2011-08-14 | 1 | -4/+4 |
| * | | Document struct match_attr | Michael Haggerty | 2011-08-14 | 1 | -0/+14 |
| * | | Add a file comment | Michael Haggerty | 2011-08-14 | 1 | -16/+10 |
* | | | 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 |
|\ \ \ \ \ \ |