summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fsck: --no-dangling omits "dangling object" informationcb/fsck-squelch-danglingJunio C Hamano2012-02-285-17/+20
* Update draft release notes to 1.7.10Junio C Hamano2012-02-231-1/+24
* Merge branch 'ld/git-p4-expanded-keywords'Junio C Hamano2012-02-233-10/+501
|\
| * git-p4: add initial support for RCS keywordsld/git-p4-expanded-keywordsLuke Diamand2012-02-233-10/+501
* | Merge branch 'jk/config-include'Junio C Hamano2012-02-238-60/+495
|\ \
| * | config: add include directiveJeff King2012-02-177-14/+292
| * | config: eliminate config_exclusive_filenameJeff King2012-02-172-9/+3
| * | config: stop using config_exclusive_filenameJeff King2012-02-172-24/+60
| * | config: provide a version of git_config with more optionsJeff King2012-02-173-4/+27
| * | config: teach git_config_rename_section a file argumentJeff King2012-02-172-7/+14
| * | config: teach git_config_set_multivar_in_file a default pathJeff King2012-02-171-13/+7
| * | config: copy the return value of prefix_filenameJeff King2012-02-171-3/+4
| * | t1300: add missing &&-chainingJeff King2012-02-171-1/+1
| * | docs/api-config: minor clarificationsJeff King2012-02-171-7/+8
| * | docs: add a basic description of the config APIJeff King2012-02-061-0/+101
* | | Merge branch 'jc/add-refresh-unmerged'Junio C Hamano2012-02-232-2/+24
|\ \ \
| * | | refresh_index: do not show unmerged path that is outside pathspecjc/add-refresh-unmergedJunio C Hamano2012-02-172-2/+24
* | | | Merge branch 'js/configure-libintl'Junio C Hamano2012-02-231-8/+12
|\ \ \ \
| * | | | configure: don't use -lintl when there is no gettext supportjs/configure-libintlJohn Szakmeister2012-02-201-8/+12
| | |/ / | |/| |
* | | | Merge branch 'pj/remote-set-branches-usage-fix'Junio C Hamano2012-02-232-2/+2
|\ \ \ \
| * | | | remote: fix set-branches usage and documentationpj/remote-set-branches-usage-fixPhilip Jägenstedt2012-02-192-2/+2
* | | | | Merge branch 'tr/perftest'Junio C Hamano2012-02-2314-552/+1363
|\ \ \ \ \
| * | | | | Add a performance test for git-greptr/perftestThomas Rast2012-02-171-0/+23
| * | | | | Introduce a performance testing frameworkThomas Rast2012-02-1712-5/+774
| * | | | | Move the user-facing test library to test-lib-functions.shThomas Rast2012-02-172-549/+568
* | | | | | Merge branch 'maint'Junio C Hamano2012-02-232-4/+11
|\ \ \ \ \ \
| * | | | | | README: point to Documentation/SubmittingPatchesMatthieu Moy2012-02-231-4/+6
| * | | | | | Document merge.branchdesc configuration variableJunio C Hamano2012-02-231-0/+5
* | | | | | | merge: do not trust fstat(2) too much when checking interactivenessJunio C Hamano2012-02-231-1/+1
* | | | | | | Sync with 1.7.9.2Junio C Hamano2012-02-222-17/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Git 1.7.9.2v1.7.9.2Junio C Hamano2012-02-222-2/+3
| * | | | | | completion: use tabs for indentationPhilip Jägenstedt2012-02-221-4/+4
| * | | | | | completion: remove stale "to submit patches" documentationPhilip Jägenstedt2012-02-221-12/+0
* | | | | | | git-p4: the option to specify 'host' is -H, not -hRussell Myers2012-02-221-1/+1
* | | | | | | t9100: remove bogus " || test" after each test scriptletJunio C Hamano2012-02-211-5/+9
* | | | | | | Merge branch 'master' of git://bogomips.org/git-svnJunio C Hamano2012-02-213-44/+59
|\ \ \ \ \ \ \
| * | | | | | | git-svn.perl: fix a false-positive in the "already exists" testSteven Walter2012-02-212-32/+44
| * | | | | | | git-svn.perl: perform deletions before anything elseSteven Walter2012-02-211-1/+1
| * | | | | | | git-svn: Fix time zone in --localtimeWei-Yin Chen (陳威尹)2012-02-211-7/+11
| * | | | | | | git-svn: un-break "git svn rebase" when log.abbrevCommit=trueÆvar Arnfjörð Bjarmason2012-02-211-2/+1
| * | | | | | | git-svn: remove redundant porcelain option to rev-listÆvar Arnfjörð Bjarmason2012-02-211-1/+1
| * | | | | | | completion: add --interactive option to git svn dcommitFrederic Heitzmann2012-02-211-1/+1
* | | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-02-211-40/+6
* | | | | | | | Merge branch 'jn/gitweb-unborn-head'Junio C Hamano2012-02-212-2/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb: Fix "heads" view when there is no current branchjn/gitweb-unborn-headJakub Narebski2012-02-172-2/+11
* | | | | | | | | Merge branch 'jk/diff-highlight'Junio C Hamano2012-02-212-37/+181
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff-highlight: document some non-optimal casesjk/diff-highlightJeff King2012-02-131-0/+93
| * | | | | | | | | diff-highlight: match multi-line hunksJeff King2012-02-132-34/+52
| * | | | | | | | | diff-highlight: refactor to prepare for multi-line hunksJeff King2012-02-131-8/+14
| * | | | | | | | | diff-highlight: don't highlight whole linesJeff King2012-02-131-2/+26