summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-04-07Git 1.8.1.6v1.8.1.6Junio C Hamano3-2/+8
2013-04-07Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1Junio C Hamano3-17/+89
2013-04-07remote-helpers/test-bzr.sh: do not use "grep '\s'"Torsten Bögershausen1-1/+1
2013-04-03Start preparing for 1.8.1.6Junio C Hamano2-1/+35
2013-04-03Merge branch 'kb/name-hash' into maint-1.8.1Junio C Hamano4-62/+166
2013-04-03Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1Junio C Hamano2-1/+14
2013-04-03Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1Junio C Hamano2-74/+97
2013-04-03Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1Junio C Hamano9-27/+145
2013-04-03Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1Junio C Hamano2-1/+67
2013-04-03Merge branch 'yd/doc-merge-annotated-tag' into maint-1.8.1Junio C Hamano2-1/+26
2013-04-03Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1Junio C Hamano1-1/+1
2013-04-03Merge branch 'jc/perl-cat-blob' into maint-1.8.1Junio C Hamano1-10/+7
2013-04-03Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1Junio C Hamano1-0/+11
2013-04-03Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1Junio C Hamano1-4/+5
2013-04-03git-tag(1): we tag HEAD by defaultThomas Rast1-0/+6
2013-03-28t: check that a pattern without trailing slash matches a directoryJeff King1-0/+27
2013-03-28dir.c::match_pathname(): pay attention to the length of string parametersJeff King1-1/+12
2013-03-28dir.c::match_pathname(): adjust patternlen when shifting patternJeff King1-0/+1
2013-03-28dir.c::match_basename(): pay attention to the length of string parametersJunio C Hamano1-4/+36
2013-03-28attr.c::path_matches(): special case paths that end with a slashJunio C Hamano1-4/+4
2013-03-28git help config: s/insn/instruction/Matthias Krüger1-1/+1
2013-03-27merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping1-1/+1
2013-03-27git-commit doc: describe use of multiple `-m` optionsChristian Helmuth1-0/+2
2013-03-27git-pull doc: fix grammo ("conflicts" is plural)Mihai Capotă1-1/+1
2013-03-26attr.c::path_matches(): the basename is part of the pathnameJunio C Hamano1-9/+10
2013-03-26Correct the docs about GIT_SSH.Dan Bornstein1-3/+6
2013-03-25Merge branch 'lf/bundle-verify-list-prereqs' into maint-1.8.1Junio C Hamano1-5/+5
2013-03-25Merge branch 'tk/doc-filter-branch' into maint-1.8.1Junio C Hamano1-2/+25
2013-03-25Merge branch 'dm/ni-maxhost-may-be-missing' into maint-1.8.1Junio C Hamano2-4/+11
2013-03-25Merge branch 'gp/describe-match-uses-glob-pattern' into maint-1.8.1Junio C Hamano1-2/+3
2013-03-25Merge branch 'nd/doc-index-format' into maint-1.8.1Junio C Hamano3-5/+13
2013-03-25Merge branch 'wk/doc-pre-rebase' into maint-1.8.1Junio C Hamano1-3/+5
2013-03-25Merge branch 'jc/color-diff-doc' into maint-1.8.1Junio C Hamano1-2/+2
2013-03-22Fix revision walk for commits with the same datesKacper Kornet2-1/+14
2013-03-21Documentation: merging a tag is a special caseJunio C Hamano2-1/+26
2013-03-20t2003: work around path mangling issue on WindowsJohannes Sixt1-2/+2
2013-03-18pack-refs: add fully-peeled traitMichael Haggerty3-6/+67
2013-03-17t1507: Test that branchname@{upstream} is interpreted as branchKacper Kornet1-0/+4
2013-03-17pack-refs: write peeled entry for non-tagsJeff King2-8/+50
2013-03-17use parse_object_or_die instead of die("bad object")Jeff King3-9/+3
2013-03-17avoid segfaults on parse_object failureJeff King4-5/+26
2013-03-17rev-parse: clarify documentation of $name@{upstream} syntaxKacper Kornet1-4/+4
2013-03-17sha1_name: pass object name length to diagnose_invalid_sha1_path()René Scharfe1-18/+14
2013-03-16Makefile: keep LIB_H entries together and sortedRené Scharfe1-16/+13
2013-03-16index-pack: fix buffer overflow caused by translationsNguyễn Thái Ngọc Duy1-4/+5
2013-03-14entry: fix filter lookupJohn Keeping2-1/+27
2013-03-14t2003: modernize styleJohn Keeping1-73/+70
2013-03-11git.c: make usage match manual pageKevin Bracey1-2/+2
2013-03-10Translate git_more_info_string consistentlyKevin Bracey1-1/+1
2013-03-09perf: update documentation of GIT_PERF_REPEAT_COUNTAntoine Pelisse1-1/+1
2013-03-08bundle: Add colons to list headings in "verify"Lukas Fleischer1-4/+4
2013-03-07bundle: Fix "verify" output if history is completeLukas Fleischer1-1/+1
2013-03-07Merge branch 'mh/maint-ceil-absolute' into maintJunio C Hamano3-16/+52
2013-03-07gitweb/README: remove reference to git.kernel.orgFredrik Gustafsson1-3/+0
2013-03-06tests: make sure rename pretty print worksAntoine Pelisse1-0/+54
2013-03-01Git 1.8.1.5v1.8.1.5Junio C Hamano3-2/+9
2013-03-01Make !pattern in .gitattributes non-fatalThomas Rast2-4/+7
2013-03-01Merge branch 'wk/user-manual' into maintJunio C Hamano1-56/+77
2013-03-01Documentation/githooks: Fix linkgitAndrew Wong1-1/+1
2013-02-27name-hash.c: fix endless loop with core.ignorecase=trueKarsten Blees4-62/+166
2013-02-27Update draft release notes to 1.8.1.5Junio C Hamano1-1/+5
2013-02-27Merge branch 'ef/non-ascii-parse-options-error-diag' into maintJunio C Hamano1-1/+4
2013-02-27Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maintJunio C Hamano1-3/+4
2013-02-27Merge branch 'jn/less-reconfigure' into maintJunio C Hamano1-6/+8
2013-02-27Documentation/submodule: Add --force to update synopsisBrad King1-1/+1
2013-02-26diff: prevent pprint_rename from underrunning inputThomas Rast1-7/+10
2013-02-26Documentation: filter-branch env-filter exampleTadeusz Andrzej Kadłubowski1-0/+20
2013-02-26git-filter-branch.txt: clarify ident variables usageTadeusz Andrzej Kadłubowski1-2/+5
2013-02-25git-compat-util.h: Provide missing netdb.h definitionsDavid Michael2-4/+11
2013-02-25Prepare for 1.8.1.5Junio C Hamano2-1/+38
2013-02-25Merge branch 'jc/mention-tracking-for-pull-default' into maintJunio C Hamano1-1/+2
2013-02-25Merge branch 'mm/config-intro-in-git-doc' into maintJunio C Hamano1-6/+5
2013-02-25Merge branch 'da/p4merge-mktemp-fix' into maintJunio C Hamano1-1/+1
2013-02-25Merge branch 'bw/get-tz-offset-perl' into maintJunio C Hamano4-13/+35
2013-02-25Merge branch 'al/mergetool-printf-fix' into maintJunio C Hamano2-2/+2
2013-02-25Merge branch 'jx/utf8-printf-width' into maintJunio C Hamano3-2/+25
2013-02-25Merge branch 'mg/bisect-doc' into maintJunio C Hamano1-1/+6
2013-02-25Merge branch 'sp/smart-http-content-type-check' into maintJunio C Hamano8-17/+59
2013-02-25Merge branch 'jc/combine-diff-many-parents' into maintJunio C Hamano2-14/+31
2013-02-25Merge branch 'jk/apply-similaritly-parsing' into maintJunio C Hamano1-4/+6
2013-02-25Merge branch 'jk/remote-helpers-doc' into maintJunio C Hamano5-7/+23
2013-02-25Merge branch 'ab/gitweb-use-same-scheme' into maintJunio C Hamano1-2/+2
2013-02-25Merge branch 'zk/clean-report-failure' into maintJunio C Hamano1-29/+125
2013-02-25Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maintJunio C Hamano1-0/+2
2013-02-25Merge branch 'da/p4merge-mktemp' into maintJunio C Hamano1-14/+13
2013-02-25Documentation: "advice" is uncountableGreg Price2-2/+2
2013-02-24describe: Document --match pattern formatGreg Price1-2/+3
2013-02-24Documentation/githooks: Explain pre-rebase parametersW. Trevor King1-3/+5
2013-02-23diff: Fix rename pretty-print when suffix and prefix overlapAntoine Pelisse1-1/+10
2013-02-23update-index: allow "-h" to also display optionsAntoine Pelisse1-1/+1
2013-02-23update-index: list supported idx versions and their featuresNguyễn Thái Ngọc Duy1-1/+9
2013-02-22diff-options: unconfuse description of --colorJunio C Hamano1-2/+2
2013-02-22Git.pm: fix cat_blob crashes on large filesJoshua Clayton1-10/+7
2013-02-22read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr()Nguyễn Thái Ngọc Duy1-1/+1
2013-02-22index-format.txt: mention of v4 is missing in some placesNguyễn Thái Ngọc Duy1-3/+3
2013-02-22Provide a mechanism to turn off symlink resolution in ceiling pathsMichael Haggerty3-16/+52
2013-02-20Makefile: avoid infinite loop on configure.ac changeJeff King1-6/+8
2013-02-20imap-send: support Server Name Indication (RFC4366)Junio C Hamano1-0/+11
2013-02-19Git 1.8.1.4v1.8.1.4Junio C Hamano4-3/+15
2013-02-19Merge branch 'ob/imap-send-ssl-verify' into maintJunio C Hamano1-2/+65
2013-02-19imap-send: support subjectAltName as wellOswald Buddenhagen1-0/+19
2013-02-19imap-send: the subject of SSL certificate must match the hostOswald Buddenhagen1-0/+39
2013-02-19user-manual: Flesh out uncommitted changes and submodule updatesW. Trevor King1-1/+3
2013-02-19user-manual: Use request-pull to generate "please pull" textW. Trevor King1-9/+5
2013-02-19user-manual: Reorganize the reroll sections, adding 'git rebase -i'W. Trevor King1-46/+69
2013-02-18imap-send: move #ifdef aroundJunio C Hamano1-2/+7
2013-02-18user-manual: typofix (ofthe->of the)Junio C Hamano1-1/+1
2013-02-18user-manual: use -o latest.tar.gz to create a gzipped tarballW. Trevor King1-3/+12
2013-02-18user-manual: use 'git config --global user.*' for setupW. Trevor King1-5/+13
2013-02-18user-manual: mention 'git remote add' for remote branch configW. Trevor King1-27/+13
2013-02-18user-manual: give 'git push -f' as an alternative to +masterW. Trevor King1-0/+7
2013-02-18user-manual: use 'remote add' to setup push URLsW. Trevor King1-5/+10
2013-02-15git.txt: update description of the configuration mechanismMatthieu Moy1-6/+5
2013-02-14user-manual: Update for receive.denyCurrentBranch=refuseW. Trevor King1-3/+4
2013-02-12Replace filepattern with pathspec for consistencyMatthieu Moy3-8/+8
2013-02-11parse-options: report uncorrupted multi-byte optionsErik Faye-Lund1-1/+4
2013-02-11Add utf8_fprintf helper that returns correct number of columnsJiang Xin3-2/+25
2013-02-11git-bisect.txt: clarify that reset quits bisectMichael J Gruber1-1/+6
2013-02-10user-manual: Rewrite git-gc section for automatic packingW. Trevor King1-12/+6
2013-02-10user-manual: Fix 'you - Git' -> 'you--Git' typoW. Trevor King1-1/+1
2013-02-10user-manual: Fix 'http' -> 'HTTP' typosW. Trevor King1-3/+3
2013-02-10user-manual: Fix 'both: so' -> 'both; so' typoW. Trevor King1-1/+1
2013-02-10p4merge: fix printf usageDavid Aguilar1-1/+1
2013-02-10difftool--helper: fix printf usageDavid Aguilar1-1/+1
2013-02-09cvsimport: format commit timestamp ourselves without using strftimeBen Walton1-1/+4
2013-02-09perl/Git.pm: fix get_tz_offset to properly handle DST boundary casesBen Walton1-3/+3
2013-02-09Move Git::SVN::get_tz to Git::get_tz_offsetBen Walton3-12/+31
2013-02-08git-mergetool: print filename when it contains %Asheesh Laroia1-1/+1
2013-02-07Git 1.8.1.3v1.8.1.3Junio C Hamano3-2/+23
2013-02-07Merge branch 'mz/pick-unborn' into maintJunio C Hamano10-48/+44
2013-02-07Merge branch 'nd/fix-perf-parameters-in-tests' into maintJunio C Hamano1-1/+1
2013-02-07Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into...Junio C Hamano2-2/+34
2013-02-07Merge branch 'ft/transport-report-segv' into maintJunio C Hamano1-1/+1
2013-02-07Merge branch 'sb/gpg-plug-fd-leak' into maintJunio C Hamano1-1/+3
2013-02-07Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano3-17/+45
2013-02-07Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maintJunio C Hamano1-2/+3
2013-02-06http_request: reset "type" strbuf before addingJeff King1-0/+1
2013-02-05t4038: add tests for "diff --cc --raw <trees>"John Keeping1-0/+24
2013-02-04t5551: fix expected error outputJunio C Hamano1-2/+1
2013-02-04Verify Content-Type from smart HTTP serversShawn Pearce8-17/+59
2013-02-04Start preparing for 1.8.1.3Junio C Hamano2-1/+29
2013-02-04Merge branch 'bc/git-p4-for-python-2.4' into maintJunio C Hamano3-11/+35
2013-02-04Merge branch 'nd/edit-branch-desc-while-detached' into maintJunio C Hamano1-4/+4
2013-02-04Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maintJunio C Hamano1-1/+5
2013-02-04Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maintJunio C Hamano1-0/+6
2013-02-04Merge branch 'dl/am-hg-locale' into maintJunio C Hamano1-1/+1
2013-02-04Merge branch 'jc/help' into maintJunio C Hamano2-18/+17
2013-02-04Merge branch 'jc/merge-blobs' into maintJunio C Hamano8-51/+118
2013-02-04Merge branch 'jc/doc-maintainer' into maintJunio C Hamano1-91/+256
2013-02-04Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash' into maintJunio C Hamano1-1/+1
2013-02-03builtin/apply: tighten (dis)similarity index parsingJohn Keeping1-4/+6
2013-02-03combine-diff: lift 32-way limit of combined diffJunio C Hamano1-14/+7
2013-02-01Makefile: explicitly set target name for autogenerated dependenciesJonathan Nieder1-2/+3
2013-02-01Rename {git- => git}remote-helpers.txtJohn Keeping5-7/+23
2013-01-31apply: diagnose incomplete submodule object name betterJunio C Hamano1-1/+5
2013-01-31apply: simplify build_fake_ancestor()Junio C Hamano1-14/+12
2013-01-31git-am: record full index line in the patch used while rebasingJunio C Hamano2-3/+29
2013-01-31doc: mention tracking for pull.defaultJunio C Hamano1-1/+2
2013-01-31gpg: close stderr once finished with it in verify_signed_buffer()Stephen Boyd1-1/+3
2013-01-31push: fix segfault when HEAD points nowhereFraser Tweedale1-1/+1
2013-01-30INSTALL: git-p4 does not support Python 3Junio C Hamano1-2/+3
2013-01-30branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy1-4/+4
2013-01-30Merge branch 'tb/t0050-maint' into maintJunio C Hamano1-35/+17
2013-01-29Merge branch 'nd/fix-directory-attrs-off-by-one' into maintJunio C Hamano1-20/+18
2013-01-29Merge branch 'ph/rebase-preserve-all-merges' into maintJunio C Hamano1-1/+6
2013-01-29README: update stale and/or incorrect informationJunio C Hamano1-8/+7
2013-01-28gitweb: refer to picon/gravatar images over the same schemeAndrej E Baranov1-2/+2
2013-01-28Git 1.8.1.2v1.8.1.2Junio C Hamano2-1/+13
2013-01-28Merge branch 'ss/help-htmlpath-config-doc' into maintJunio C Hamano1-0/+6
2013-01-28Merge branch 'nd/attr-debug-fix' into maintJunio C Hamano1-1/+1
2013-01-28Merge branch 'ds/completion-silence-in-tree-path-probe' into maintJunio C Hamano1-1/+1
2013-01-28Merge branch 'jn/maint-trim-vim-contrib' into maintJunio C Hamano1-13/+3
2013-01-28Merge branch 'pe/doc-email-env-is-trumped-by-config' into maintJunio C Hamano1-2/+2
2013-01-28Merge branch 'mk/complete-tcsh' into maintJunio C Hamano1-12/+21
2013-01-28Merge branch 'ap/status-ignored-in-ignored-directory' into maintJunio C Hamano3-22/+225
2013-01-28Merge branch 'er/stop-recommending-parsecvs' into maintJunio C Hamano1-4/+2
2013-01-28Merge branch 'mh/ceiling' into maintJunio C Hamano11-165/+202
2013-01-26git-p4.py: support Python 2.4Brandon Casey3-9/+31
2013-01-26git-p4.py: support Python 2.5Brandon Casey2-2/+3
2013-01-25howto/maintain: document "### match next" convention in jch/pu branchJunio C Hamano1-5/+6
2013-01-25ident: do not drop username when reading from /etc/mailnameJonathan Nieder1-1/+5
2013-01-24t9902: protect test from stray build artifactsJunio C Hamano2-2/+34
2013-01-24git-cvsimport.txt: cvsps-2 is deprecatedJohn Keeping1-0/+6
2013-01-22Makefile: Replace merge-file.h with merge-blobs.h in LIB_HRamsay Jones1-1/+1
2013-01-21t0050: Use TAB for indentationTorsten Bögershausen1-33/+15
2013-01-21t0050: honor CASE_INSENSITIVE_FS in add (with different case)Torsten Bögershausen1-1/+1
2013-01-21t0050: known breakage vanished in merge (case change)Torsten Bögershausen1-1/+1
2013-01-21git-for-each-ref.txt: 'raw' is a supported date formatJohn Keeping1-1/+1
2013-01-20Start preparing for 1.8.1.2Junio C Hamano2-1/+14
2013-01-20Merge branch 'nz/send-email-headers-are-case-insensitive' into maintJunio C Hamano1-5/+5
2013-01-20Merge branch 'rs/zip-with-uncompressed-size-in-the-header' into maintJunio C Hamano1-5/+2
2013-01-20Merge branch 'rs/zip-tests' into maintJunio C Hamano5-80/+140
2013-01-18help: include <common-cmds.h> only in one fileJunio C Hamano2-18/+17
2013-01-18am: invoke perl's strftime in C localeDmitry V. Levin1-1/+1
2013-01-18git-completion.bash: replace zsh notation that breaks bash 3.XBrandon Casey1-1/+1
2013-01-16attr: avoid calling find_basename() twice per pathDuy Nguyen1-27/+18
2013-01-15config.txt: Document help.htmlpath config parameterSebastian Staudt1-0/+6
2013-01-15test-lib.sh: unfilter GIT_PERF_*Nguyễn Thái Ngọc Duy1-1/+1
2013-01-15attr: make it build with DEBUG_ATTR againNguyễn Thái Ngọc Duy1-1/+1
2013-01-15attr: fix off-by-one directory component length calculationNguyễn Thái Ngọc Duy1-0/+7