summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-08-25Git 1.7.7-rc0v1.7.7-rc0Junio C Hamano2-3/+10
2011-08-25Merge branch 'jc/merge-reword'Junio C Hamano2-4/+4
2011-08-25Merge branch 'mg/branch-set-upstream-previous'Junio C Hamano2-1/+15
2011-08-25Merge branch 'da/difftool-mergtool-refactor'Junio C Hamano18-320/+432
2011-08-25Merge branch 'jc/maint-autofix-tag-in-head'Junio C Hamano1-42/+45
2011-08-25Merge branch 'di/fast-import-doc'Junio C Hamano2-3/+54
2011-08-25Merge branch 'jn/plug-empty-tree-leak'Junio C Hamano3-12/+30
2011-08-25Merge branch 'ac/describe-dirty-refresh'Junio C Hamano1-2/+15
2011-08-25Merge branch 'di/parse-options-split'Junio C Hamano6-152/+159
2011-08-25Merge branch 'js/i18n-scripts'Junio C Hamano5-40/+44
2011-08-25Merge branch 'maint'Junio C Hamano5-5/+5
2011-08-25whitespace: have SP on both sides of an assignment "="Junio C Hamano4-4/+4
2011-08-25update-ref: whitespace fixPang Yan Han1-1/+1
2011-08-24Sync with 1.7.6.1Junio C Hamano2-1/+4
2011-08-24Git 1.7.6.1v1.7.6.1Junio C Hamano2-2/+3
2011-08-24Merge branch 'jc/maint-smart-http-race-upload-pack' into maintJunio C Hamano1-0/+2
2011-08-24get_indexed_object can return NULL if nothing is in that slot; check for itBrian Harring1-0/+2
2011-08-23Update draft release notes to 1.7.7Junio C Hamano1-15/+9
2011-08-23Merge branch 'rt/zlib-smaller-window'Junio C Hamano23-13/+99
2011-08-23Merge branch 'jn/maint-test-return'Junio C Hamano2-9/+13
2011-08-23Merge branch 'cb/maint-ls-files-error-report'Junio C Hamano6-10/+88
2011-08-23Merge branch 'maint'Junio C Hamano1-0/+11
2011-08-23Update draft release notes for 1.7.6.1Junio C Hamano1-0/+11
2011-08-23Merge branch 'jc/maint-combined-diff-work-tree' into maintJunio C Hamano1-4/+10
2011-08-23Merge branch 'cb/maint-exec-error-report' into maintJunio C Hamano3-17/+33
2011-08-23Merge branch 'cb/maint-quiet-push' into maintJunio C Hamano6-10/+39
2011-08-23Merge branch 'jc/maint-smart-http-race-upload-pack' into maintJunio C Hamano1-9/+98
2011-08-23Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maintJunio C Hamano1-0/+5
2011-08-22Merge branch 'maint'Junio C Hamano2-1/+82
2011-08-22add technical documentation about ref iterationHeiko Voigt1-0/+81
2011-08-22Do not use C++-style commentsMichael Haggerty1-1/+1
2011-08-19commit: reduce use of redundant global variablesJunio C Hamano1-42/+45
2011-08-19branch.c: use the parsed branch nameMichael J Gruber2-1/+15
2011-08-19mergetools/meld: Use '--output' when availableDavid Aguilar1-1/+24
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar17-333/+369
2011-08-19mergetool--lib: Make style consistent with gitDavid Aguilar1-53/+100
2011-08-19difftool--helper: Make style consistent with gitDavid Aguilar1-6/+12
2011-08-18Update draft release notes to 1.7.7Junio C Hamano1-0/+6
2011-08-18Merge branch 'db/am-skip-blank-at-the-beginning'Junio C Hamano2-3/+26
2011-08-18Merge branch 'ma/am-exclude'Junio C Hamano2-2/+5
2011-08-18Merge branch 'maint'Junio C Hamano1-0/+2
2011-08-18fetch-pack: check for valid commit from serverNguyễn Thái Ngọc Duy1-0/+2
2011-08-17Update draft release notes to 1.7.7Junio C Hamano1-1/+34
2011-08-17Merge branch 'mh/check-attr-relative'Junio C Hamano14-115/+322
2011-08-17Merge branch 'js/bisect-no-checkout'Junio C Hamano7-178/+430
2011-08-17Merge branch 'rc/histogram-diff'Junio C Hamano14-285/+655
2011-08-17Merge branch 'jc/maint-smart-http-race-upload-pack'Junio C Hamano1-9/+98
2011-08-17Merge branch 'js/sh-style'Junio C Hamano4-12/+12
2011-08-17Merge branch 'js/ref-namespaces'Junio C Hamano15-24/+326
2011-08-17Merge branch 'cb/maint-quiet-push'Junio C Hamano6-10/+39
2011-08-17Merge branch 'jc/maint-combined-diff-work-tree'Junio C Hamano1-4/+10
2011-08-17Merge branch 'cb/maint-exec-error-report'Junio C Hamano3-17/+33
2011-08-17Merge branch 'maint'Junio C Hamano1-32/+0
2011-08-17doc/fast-import: document feature import-marks-if-existsDmitry Ivankov2-3/+54
2011-08-17checkout-index: remove obsolete commentNguyễn Thái Ngọc Duy1-32/+0
2011-08-16Sync with "maint"Junio C Hamano1-49/+1
2011-08-16Merge branch 'maint'Junio C Hamano2-0/+54
2011-08-16merge-recursive: take advantage of hardcoded empty treeJonathan Nieder1-5/+3
2011-08-16Prepare for 1.7.6.1Junio C Hamano2-1/+53
2011-08-16Merge branch 'jk/tag-list-multiple-patterns' into maintJunio C Hamano3-12/+28
2011-08-16Merge branch 'jl/submodule-update-quiet' into maintJunio C Hamano2-4/+11
2011-08-16Merge branch 'jl/submodule-add-relurl-wo-upstream' into maintJunio C Hamano3-11/+15
2011-08-16Merge branch 'oa/pull-reflog' into maintJunio C Hamano1-1/+1
2011-08-16Merge branch 'js/ls-tree-error' into maintJunio C Hamano2-3/+25
2011-08-16Merge branch 'jk/fast-export-quote-path' into maintJunio C Hamano2-8/+51
2011-08-16Merge branch 'jc/checkout-reflog-fix' into maintJunio C Hamano1-2/+5
2011-08-16Merge branch 'jc/maint-reset-unmerged-path' into maintJunio C Hamano3-2/+18
2011-08-16Merge branch 'mz/doc-rebase-abort' into maintJunio C Hamano2-7/+11
2011-08-16Merge branch 'bw/log-all-ref-updates-doc' into maintJunio C Hamano2-3/+6
2011-08-16Merge branch 'js/maint-add-path-stat-pwd' into maintJunio C Hamano1-1/+2
2011-08-16Merge branch 'ms/help-unknown' into maintJunio C Hamano1-0/+12
2011-08-16Merge branch 'mz/doc-synopsis-verse' into maintJunio C Hamano93-6/+92
2011-08-16Merge branch 'jn/mime-type-with-params' into maintJunio C Hamano1-1/+10
2011-08-16Merge branch 'jc/submodule-sync-no-auto-vivify' into maintJunio C Hamano3-30/+47
2011-08-16Merge branch 'jc/zlib-wrap' into maintJunio C Hamano15-124/+321
2011-08-16Merge branch 'fk/relink-upon-ldflags-update' into maintJunio C Hamano2-8/+18
2011-08-16Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maintJunio C Hamano2-1/+23
2011-08-16Merge branch 'aw/rebase-i-p' into maintJunio C Hamano4-5/+30
2011-08-16Merge branch 'jc/diff-index-quick-exit-early' into maintJunio C Hamano3-2/+10
2011-08-16Merge branch 'jk/combine-diff-binary-etc' into maintJunio C Hamano5-83/+376
2011-08-16am: refresh the index at start and --resolvedJeff King1-0/+2
2011-08-16revert: plug memory leak in "cherry-pick root commit" codepathJonathan Nieder2-7/+27
2011-08-11ls-files: fix pathspec display on errorClemens Buchacher6-10/+88
2011-08-11describe: Refresh the index when run with --dirtyAllan Caffee1-2/+15
2011-08-11test: consolidate definition of $LFJunio C Hamano5-9/+4
2011-08-11Tolerate zlib deflation with window size < 32KbRoberto Tyley19-6/+97
2011-08-11am: ignore leading whitespace before patchDavid Barr2-3/+26
2011-08-11Reduce parse-options.o dependenciesDmitry Ivankov5-150/+155
2011-08-11parse-options: export opterr, optbugDmitry Ivankov2-2/+4
2011-08-11Update draft release notes to 1.7.7Junio C Hamano1-3/+36
2011-08-11t3900: do not reference numbered arguments from the test scriptJohannes Sixt1-2/+2
2011-08-11Merge branch 'cb/partial-commit-relative-pathspec'Junio C Hamano4-38/+39
2011-08-11Merge branch 'jk/fast-export-quote-path'Junio C Hamano2-8/+51
2011-08-11Merge branch 'rc/maint-http-wrong-free'Junio C Hamano2-9/+5
2011-08-11Merge branch 'rs/grep-function-context'Junio C Hamano5-23/+67
2011-08-11Merge branch 'ef/ipv4-connect-error-report'Junio C Hamano1-13/+10
2011-08-09am: Document new --exclude=<path> optionmaximilian attems1-1/+3
2011-08-09bisect: add support for bisecting bare repositoriesJon Seymour4-3/+40
2011-08-08helping smart-http/stateless-rpc fetch raceJunio C Hamano1-9/+98
2011-08-08xdiff/xhistogram: drop need for additional variableTay Ray Chuan1-5/+4
2011-08-08xdiff/xhistogram: rely on xdl_trim_ends()Tay Ray Chuan1-27/+4
2011-08-08xdiff/xhistogram: rework handling of recursed resultsTay Ray Chuan1-6/+9
2011-08-08Merge branch 'oa/pull-reflog'Junio C Hamano1-1/+1
2011-08-08Merge branch 'ms/reflog-show-is-default'Junio C Hamano1-2/+1
2011-08-08Merge branch 'jl/submodule-status-summary-doc'Junio C Hamano1-12/+26
2011-08-08Merge branch 'jn/gitweb-config-list-case'Junio C Hamano1-0/+7
2011-08-08Merge branch 'jl/submodule-update-quiet'Junio C Hamano2-4/+11
2011-08-08Merge branch 'js/ls-tree-error'Junio C Hamano2-3/+25
2011-08-08Merge branch 'jn/gitweb-system-config'Junio C Hamano4-7/+53
2011-08-08Merge branch 'jk/reset-reflog-message-fix'Junio C Hamano2-37/+20
2011-08-08Merge branch 'jc/diff-index-refactor'Junio C Hamano1-52/+19
2011-08-08receive-pack: do not overstep command line argument arrayJunio C Hamano1-1/+1
2011-08-08Merge branch 'maint'Junio C Hamano3-1/+3
2011-08-08filter-branch: Export variable `workdir' for --commit-filterMichael Witten1-1/+1
2011-08-08submodule: take advantage of gettextln and eval_gettextln.Jon Seymour1-12/+6
2011-08-08stash: take advantage of eval_gettextlnJon Seymour1-6/+3
2011-08-08pull: take advantage of eval_gettextlnJon Seymour1-5/+2
2011-08-08git-am: take advantage of gettextln and eval_gettextln.Jon Seymour1-17/+14
2011-08-08gettext: add gettextln, eval_gettextln to encode common idiomJon Seymour1-0/+19
2011-08-08test: cope better with use of return for errorsJonathan Nieder1-2/+8
2011-08-08test: simplify return value of test_run_Jonathan Nieder1-5/+3
2011-08-08Documentation/Makefile: add *.pdf to `clean' targetEmilio G. Cota1-0/+1
2011-08-08Documentation: ignore *.pdf filesEmilio G. Cota1-0/+1
2011-08-05fast-export: quote paths in outputJeff King2-8/+51
2011-08-05filter-branch.sh: de-dent usage stringJunio C Hamano1-5/+5
2011-08-05misc-sh: fix up whitespace in some other .sh files.Jon Seymour4-12/+12
2011-08-05Merge branch 'tc/minix'Junio C Hamano1-1/+29
2011-08-05Merge branch 'jc/pack-order-tweak'Junio C Hamano5-1/+165
2011-08-05bisect: further style nitpicksJunio C Hamano1-10/+8
2011-08-05bisect: replace "; then" with "\n<tab>*then"Jon Seymour1-9/+18
2011-08-05bisect: cleanup whitespace errors in git-bisect.sh.Jon Seymour1-134/+134
2011-08-04test-path-utils: Add subcommand "prefix_path"Michael Haggerty1-0/+13
2011-08-04test-path-utils: Add subcommand "absolute_path"Michael Haggerty1-0/+9
2011-08-04git-check-attr: Normalize pathsMichael Haggerty2-10/+14
2011-08-04git-check-attr: Demonstrate problems with relative pathsMichael Haggerty1-1/+14
2011-08-04git-check-attr: Demonstrate problems with unnormalized pathsMichael Haggerty1-0/+9
2011-08-04git-check-attr: test that no output is written to stderrMichael Haggerty1-2/+3
2011-08-04Rename git_checkattr() to git_check_attr()Michael Haggerty10-16/+16
2011-08-04git-check-attr: Fix command-line handling to match docsMichael Haggerty3-9/+14
2011-08-04git-check-attr: Drive two tests using the same raw dataMichael Haggerty1-36/+23
2011-08-04git-check-attr: Add an --all option to show all attributesMichael Haggerty3-18/+74
2011-08-04git-check-attr: Error out if no pathnames are specifiedMichael Haggerty2-2/+9
2011-08-04git-check-attr: Process command-line args more systematicallyMichael Haggerty1-7/+12
2011-08-04git-check-attr: Handle each error separatelyMichael Haggerty1-7/+4
2011-08-04git-check-attr: Extract a function error_with_usage()Michael Haggerty1-2/+7
2011-08-04git-check-attr: Introduce a new variableMichael Haggerty1-6/+7
2011-08-04git-check-attr: Extract a function output_attr()Michael Haggerty1-3/+9
2011-08-04Allow querying all attributes on a fileMichael Haggerty3-14/+67
2011-08-04Remove redundant checkMichael Haggerty1-2/+1
2011-08-04Remove redundant call to bootstrap_attr_stack()Michael Haggerty1-1/+0
2011-08-04Extract a function collect_all_attrs()Michael Haggerty1-3/+14
2011-08-04Teach prepare_attr_stack() to figure out dirlen itselfMichael Haggerty1-10/+11
2011-08-04git-check-attr: Use git_attr_name()Michael Haggerty1-7/+6
2011-08-04Provide access to the name attribute of git_attrMichael Haggerty3-1/+14
2011-08-04git-check-attr: Add tests of command-line parsingMichael Haggerty1-0/+7
2011-08-04git-check-attr: Add missing "&&"Michael Haggerty1-1/+1
2011-08-04Disallow the empty string as an attribute nameMichael Haggerty2-1/+7
2011-08-04Remove anachronism from commentMichael Haggerty1-4/+2
2011-08-04doc: Correct git_attr() calls in example codeMichael Haggerty1-5/+5
2011-08-04doc: Add a link from gitattributes(5) to git-check-attr(1)Michael Haggerty1-0/+3
2011-08-04docs: put listed example commands in backticksJeff King13-66/+66
2011-08-04bisect: add documentation for --no-checkout option.Jon Seymour1-1/+31
2011-08-04bisect: add tests for the --no-checkout option.Jon Seymour1-0/+82
2011-08-04bisect: introduce --no-checkout support into porcelain.Jon Seymour1-11/+37
2011-08-04bisect: introduce support for --no-checkout option.Jon Seymour3-14/+28
2011-08-04bisect: add tests to document expected behaviour in presence of broken trees.Jon Seymour1-0/+48
2011-08-04bisect: use && to connect statements that are deferred with eval.Jon Seymour1-2/+2
2011-08-04bisect: move argument parsing before state modification.Jon Seymour2-36/+44
2011-08-04gitweb: pass string after encoding in utf-8 to syntax highlighter张忠山1-1/+1
2011-08-04Add option hooks.diffopts to customize change summary in post-receive-emailJon Jensen1-1/+8
2011-08-04diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"Junio C Hamano1-4/+10
2011-08-03Merge branch 'maint'Junio C Hamano2-11/+16
2011-08-03add gitignore entry to description about how to write a builtinHeiko Voigt1-0/+2
2011-08-03Makefile: some changes for http-related flag documentationTay Ray Chuan1-3/+3
2011-08-03http.c: fix an invalid free()Tay Ray Chuan1-6/+2
2011-08-03am: pass exclude down to applymaximilian attems1-1/+2
2011-08-03gitattributes: Reword "attribute macro" to "macro attribute"Michael Haggerty1-9/+9
2011-08-03gitattributes: Clarify discussion of attribute macrosMichael Haggerty1-5/+8
2011-08-03Skip archive --remote tests on WindowsJohannes Sixt1-4/+4
2011-08-03xdiff: do away with xdl_mmfile_next()Tay Ray Chuan3-20/+2
2011-08-03Make test number uniqueJohannes Sixt1-0/+0
2011-08-02commit: allow partial commits with relative pathsClemens Buchacher4-38/+39
2011-08-01notice error exit from pagerClemens Buchacher1-9/+6
2011-08-01grep: long context optionsRené Scharfe2-13/+21
2011-08-01grep: add option to show whole function as contextRené Scharfe5-11/+47
2011-08-01pull: remove extra space from reflog messageOri Avtalion1-1/+1
2011-08-01Documentation/submodule: add command references and update optionsJens Lehmann1-12/+26
2011-08-01Merge branch 'vi/make-test-vector-less-specific'Junio C Hamano8-13/+13
2011-08-01Merge branch 'jk/clone-detached'Junio C Hamano4-6/+88
2011-08-01Merge branch 'jc/streaming-filter'Junio C Hamano1-1/+3
2011-08-01Merge branch 'sr/transport-helper-fix'Junio C Hamano15-187/+475
2011-08-01Merge branch 'jc/maint-reset-unmerged-path'Junio C Hamano3-2/+18
2011-08-01Merge branch 'maint'Junio C Hamano1-1/+1
2011-08-01Merge branch 'nk/ref-doc' into maintJunio C Hamano4-30/+34
2011-08-01Merge branch 'jl/maint-fetch-recursive-fix' into maintJunio C Hamano2-8/+9
2011-08-01Merge branch 'jc/maint-cygwin-trust-executable-bit-default' into maintJunio C Hamano1-1/+1
2011-08-01Merge branch 'jc/legacy-loose-object' into maintJunio C Hamano1-29/+33
2011-08-01Merge branch 'an/shallow-doc' into maintJunio C Hamano1-29/+74
2011-08-01Merge branch 'jc/maint-1.7.3-checkout-describe' into maintJunio C Hamano4-1/+19
2011-08-01reflog: actually default to subcommand 'show'Michael Schubert1-2/+1