summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Makefile: Use computed header dependencies if the compiler supports itfk/make-auto-header-dependenciesFredrik Kuivinen2011-08-181-4/+9
* Update draft release notes to 1.7.7Junio C Hamano2011-08-171-1/+34
* Merge branch 'mh/check-attr-relative'Junio C Hamano2011-08-1714-115/+322
|\
| * test-path-utils: Add subcommand "prefix_path"Michael Haggerty2011-08-041-0/+13
| * test-path-utils: Add subcommand "absolute_path"Michael Haggerty2011-08-041-0/+9
| * git-check-attr: Normalize pathsMichael Haggerty2011-08-042-10/+14
| * git-check-attr: Demonstrate problems with relative pathsMichael Haggerty2011-08-041-1/+14
| * git-check-attr: Demonstrate problems with unnormalized pathsMichael Haggerty2011-08-041-0/+9
| * git-check-attr: test that no output is written to stderrMichael Haggerty2011-08-041-2/+3
| * Rename git_checkattr() to git_check_attr()Michael Haggerty2011-08-0410-16/+16
| * git-check-attr: Fix command-line handling to match docsMichael Haggerty2011-08-043-9/+14
| * git-check-attr: Drive two tests using the same raw dataMichael Haggerty2011-08-041-36/+23
| * git-check-attr: Add an --all option to show all attributesMichael Haggerty2011-08-043-18/+74
| * git-check-attr: Error out if no pathnames are specifiedMichael Haggerty2011-08-042-2/+9
| * git-check-attr: Process command-line args more systematicallyMichael Haggerty2011-08-041-7/+12
| * git-check-attr: Handle each error separatelyMichael Haggerty2011-08-041-7/+4
| * git-check-attr: Extract a function error_with_usage()Michael Haggerty2011-08-041-2/+7
| * git-check-attr: Introduce a new variableMichael Haggerty2011-08-041-6/+7
| * git-check-attr: Extract a function output_attr()Michael Haggerty2011-08-041-3/+9
| * Allow querying all attributes on a fileMichael Haggerty2011-08-043-14/+67
| * Remove redundant checkMichael Haggerty2011-08-041-2/+1
| * Remove redundant call to bootstrap_attr_stack()Michael Haggerty2011-08-041-1/+0
| * Extract a function collect_all_attrs()Michael Haggerty2011-08-041-3/+14
| * Teach prepare_attr_stack() to figure out dirlen itselfMichael Haggerty2011-08-041-10/+11
| * git-check-attr: Use git_attr_name()Michael Haggerty2011-08-041-7/+6
| * Provide access to the name attribute of git_attrMichael Haggerty2011-08-043-1/+14
| * git-check-attr: Add tests of command-line parsingMichael Haggerty2011-08-041-0/+7
| * git-check-attr: Add missing "&&"Michael Haggerty2011-08-041-1/+1
| * Disallow the empty string as an attribute nameMichael Haggerty2011-08-042-1/+7
| * Remove anachronism from commentMichael Haggerty2011-08-041-4/+2
| * doc: Correct git_attr() calls in example codeMichael Haggerty2011-08-041-5/+5
| * doc: Add a link from gitattributes(5) to git-check-attr(1)Michael Haggerty2011-08-041-0/+3
* | Merge branch 'js/bisect-no-checkout'Junio C Hamano2011-08-177-178/+430
|\ \
| * | bisect: add support for bisecting bare repositoriesJon Seymour2011-08-094-3/+40
| * | bisect: further style nitpicksJunio C Hamano2011-08-051-10/+8
| * | bisect: replace "; then" with "\n<tab>*then"Jon Seymour2011-08-051-9/+18
| * | bisect: cleanup whitespace errors in git-bisect.sh.Jon Seymour2011-08-051-134/+134
| * | bisect: add documentation for --no-checkout option.Jon Seymour2011-08-041-1/+31
| * | bisect: add tests for the --no-checkout option.Jon Seymour2011-08-041-0/+82
| * | bisect: introduce --no-checkout support into porcelain.Jon Seymour2011-08-041-11/+37
| * | bisect: introduce support for --no-checkout option.Jon Seymour2011-08-043-14/+28
| * | bisect: add tests to document expected behaviour in presence of broken trees.Jon Seymour2011-08-041-0/+48
| * | bisect: use && to connect statements that are deferred with eval.Jon Seymour2011-08-041-2/+2
| * | bisect: move argument parsing before state modification.Jon Seymour2011-08-042-36/+44
* | | Merge branch 'rc/histogram-diff'Junio C Hamano2011-08-1714-285/+655
|\ \ \
| * | | xdiff/xhistogram: drop need for additional variableTay Ray Chuan2011-08-081-5/+4
| * | | xdiff/xhistogram: rely on xdl_trim_ends()Tay Ray Chuan2011-08-081-27/+4
| * | | xdiff/xhistogram: rework handling of recursed resultsTay Ray Chuan2011-08-081-6/+9
| * | | xdiff: do away with xdl_mmfile_next()Tay Ray Chuan2011-08-033-20/+2
| * | | Make test number uniqueJohannes Sixt2011-08-031-0/+0