summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | sha1_file: typofixJunio C Hamano2011-05-151-1/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-143-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-143-6/+6
* | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-131-30/+16
* | | | | | | | | | | | | | | | | | | | Merge branch 'bf/commit-template-no-cleanup'Junio C Hamano2011-05-133-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Do not strip empty lines / trailing spaces from a commit message templateBoris Faure2011-05-113-1/+25
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha'Junio C Hamano2011-05-131-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | t1507: avoid "${parameter<op>'word'}" inside double-quotesJunio C Hamano2011-05-091-2/+5
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/rerere-libify-clear-gc'Junio C Hamano2011-05-133-75/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | rerere: libify rerere_clear() and rerere_gc()Junio C Hamano2011-05-083-75/+88
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Junio C Hamano2011-05-131-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-05-051-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | send-pack: unbreak push over stateless rpcJeff King2011-05-051-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-04-251-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | send-pack: avoid deadlock when pack-object dies earlyJohannes Sixt2011-04-251-0/+4
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/dirstat-lines'Junio C Hamano2011-05-135-32/+1219
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Mark dirstat error messages for translationJohan Herland2011-04-292-15/+15
| * | | | | | | | | | | | | | | | | | | | | | | | Improve error handling when parsing dirstat parametersJohan Herland2011-04-292-30/+78
| * | | | | | | | | | | | | | | | | | | | | | | | New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland2011-04-295-2/+176
| * | | | | | | | | | | | | | | | | | | | | | | | Allow specifying --dirstat cut-off percentage as a floating point numberJohan Herland2011-04-293-11/+81
| * | | | | | | | | | | | | | | | | | | | | | | | Add config variable for specifying default --dirstat behaviorJohan Herland2011-04-294-1/+119
| * | | | | | | | | | | | | | | | | | | | | | | | Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-fileJohan Herland2011-04-293-22/+214
| * | | | | | | | | | | | | | | | | | | | | | | | Make --dirstat=0 output directories that contribute < 0.1% of changesJohan Herland2011-04-292-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | Add several testcases for --dirstat and friendsJohan Herland2011-04-291-0/+585
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fix-add-u-unmerged'Junio C Hamano2011-05-132-39/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2011-04-232-39/+30
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/setup-revisions-glob-and-friends-passthru'Junio C Hamano2011-05-132-65/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | revisions: allow --glob and friends in parse_options-enabled commandsJonathan Nieder2011-04-212-1/+63
| * | | | | | | | | | | | | | | | | | | | | | | | | revisions: split out handle_revision_pseudo_opt functionJonathan Nieder2011-04-211-64/+59
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cn/log-parse-opt'Junio C Hamano2011-05-131-30/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | log: convert to parse-optionsCarlos Martín Nieto2011-04-141-30/+43
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-132-2/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Prepare for 1.7.5.2Junio C Hamano2011-05-132-1/+34
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'aw/maint-rebase-i-p-no-ff' into maintJunio C Hamano2011-05-132-2/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-133-3/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gr/cvsimport-alternative-cvspass-location' into maintJunio C Hamano2011-05-131-12/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cj/p4merge' into maintJunio C Hamano2011-05-131-6/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/merge-one-file-working-tree' into maintJunio C Hamano2011-05-132-1/+106
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-1316-36/+120
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mz/maint-rename-unmerged' into maintJunio C Hamano2011-05-132-2/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5400: Fix a couple of typosJohan Herland2011-05-131-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-121-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweak t3102-ls-tree-wildcards to run on WindowsJohannes Sixt2011-05-121-7/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-111-3/+18
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-dependency'Junio C Hamano2011-05-111-27/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitweb/gitweb.cgi and other legacy targets from main MakefileJakub Narebski2011-05-081-26/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-instaweb: Simplify build dependency on gitwebJakub Narebski2011-05-081-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano2011-05-112-15/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge: make branch.<name>.mergeoptions correctly override merge.<option>Junio C Hamano2011-05-062-14/+57
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/maint-test-merge-verify-parents'Junio C Hamano2011-05-112-99/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \