summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* bisect: take advantage of gettextln, eval_gettextln.Jon Seymour2011-08-301-35/+14
* Merge branch 'js/i18n-scripts'Junio C Hamano2011-08-255-40/+44
|\
| * submodule: take advantage of gettextln and eval_gettextln.Jon Seymour2011-08-081-12/+6
| * stash: take advantage of eval_gettextlnJon Seymour2011-08-081-6/+3
| * pull: take advantage of eval_gettextlnJon Seymour2011-08-081-5/+2
| * git-am: take advantage of gettextln and eval_gettextln.Jon Seymour2011-08-081-17/+14
| * gettext: add gettextln, eval_gettextln to encode common idiomJon Seymour2011-08-081-0/+19
* | Merge branch 'maint'Junio C Hamano2011-08-255-5/+5
|\ \
| * | whitespace: have SP on both sides of an assignment "="Junio C Hamano2011-08-254-4/+4
| * | update-ref: whitespace fixPang Yan Han2011-08-251-1/+1
* | | Sync with 1.7.6.1Junio C Hamano2011-08-242-1/+4
|\ \ \ | |/ /
| * | Git 1.7.6.1v1.7.6.1Junio C Hamano2011-08-242-2/+3
| * | Merge branch 'jc/maint-smart-http-race-upload-pack' into maintJunio C Hamano2011-08-241-0/+2
| |\ \
| | * | get_indexed_object can return NULL if nothing is in that slot; check for itBrian Harring2011-08-241-0/+2
* | | | Update draft release notes to 1.7.7Junio C Hamano2011-08-231-15/+9
* | | | Merge branch 'rt/zlib-smaller-window'Junio C Hamano2011-08-2323-13/+99
|\ \ \ \
| * | | | test: consolidate definition of $LFJunio C Hamano2011-08-115-9/+4
| * | | | Tolerate zlib deflation with window size < 32KbRoberto Tyley2011-08-1119-6/+97
* | | | | Merge branch 'jn/maint-test-return'Junio C Hamano2011-08-232-9/+13
|\ \ \ \ \
| * | | | | t3900: do not reference numbered arguments from the test scriptJohannes Sixt2011-08-111-2/+2
| * | | | | test: cope better with use of return for errorsJonathan Nieder2011-08-081-2/+8
| * | | | | test: simplify return value of test_run_Jonathan Nieder2011-08-081-5/+3
| |/ / / /
* | | | | Merge branch 'cb/maint-ls-files-error-report'Junio C Hamano2011-08-236-10/+88
|\ \ \ \ \
| * | | | | ls-files: fix pathspec display on errorClemens Buchacher2011-08-116-10/+88
* | | | | | Merge branch 'maint'Junio C Hamano2011-08-231-0/+11
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Update draft release notes for 1.7.6.1Junio C Hamano2011-08-231-0/+11
| * | | | | Merge branch 'jc/maint-combined-diff-work-tree' into maintJunio C Hamano2011-08-231-4/+10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cb/maint-exec-error-report' into maintJunio C Hamano2011-08-233-17/+33
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cb/maint-quiet-push' into maintJunio C Hamano2011-08-236-10/+39
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/maint-smart-http-race-upload-pack' into maintJunio C Hamano2011-08-231-9/+98
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maintJunio C Hamano2011-08-231-0/+5
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2011-08-222-1/+82
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | add technical documentation about ref iterationHeiko Voigt2011-08-221-0/+81
| * | | | | | | | | Do not use C++-style commentsMichael Haggerty2011-08-221-1/+1
* | | | | | | | | | Update draft release notes to 1.7.7Junio C Hamano2011-08-181-0/+6
* | | | | | | | | | Merge branch 'db/am-skip-blank-at-the-beginning'Junio C Hamano2011-08-182-3/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | am: ignore leading whitespace before patchDavid Barr2011-08-112-3/+26
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ma/am-exclude'Junio C Hamano2011-08-182-2/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | am: Document new --exclude=<path> optionmaximilian attems2011-08-091-1/+3
| * | | | | | | | | | am: pass exclude down to applymaximilian attems2011-08-031-1/+2
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-08-181-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | fetch-pack: check for valid commit from serverNguyễn Thái Ngọc Duy2011-08-181-0/+2
* | | | | | | | | | | 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