summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-04-07Git 1.8.2.1v1.8.2.1Junio C Hamano3-2/+8
2013-04-07Sync with 1.8.1.6Junio C Hamano6-21/+99
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-04mailmap: update Pasky's addressJunio C Hamano1-0/+1
2013-04-04Merge branch 'nd/index-pack-threaded-fixes' into maintJunio C Hamano1-8/+26
2013-04-04Merge branch 'jk/index-pack-correct-depth-fix' into maintJunio C Hamano1-0/+2
2013-04-04Merge branch 'rs/submodule-summary-limit' into maintJunio C Hamano1-6/+11
2013-04-04Merge branch 'jk/peel-ref' into maintJunio C Hamano2-4/+11
2013-04-04git-remote-mediawiki: new wiki URL in documentationMatthieu Moy1-1/+1
2013-04-03Update draft release notes to 1.8.2.1Junio C Hamano1-0/+35
2013-04-03Merge branch 'mg/gpg-interface-using-status' into maintJunio C Hamano7-25/+46
2013-04-03Merge branch 'bc/commit-complete-lines-given-via-m-option' into maintJunio C Hamano3-15/+34
2013-04-03Merge branch 'jc/describe' into maintJunio C Hamano1-21/+20
2013-04-03Merge branch 'jk/alias-in-bare' into maintJunio C Hamano5-12/+53
2013-04-03Merge branch 'ks/rfc2047-one-char-at-a-time' into maintJunio C Hamano4-25/+77
2013-04-03Merge branch 'jk/empty-archive' into maintJunio C Hamano6-13/+109
2013-04-03Merge branch 'ph/tag-force-no-warn-on-creation' into maintJunio C Hamano2-1/+13
2013-04-03Merge branch 'lf/setup-prefix-pathspec' into maintJunio C Hamano1-5/+7
2013-04-03Sync with 1.8.1 maintenance trackJunio C Hamano19-164/+462
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-04-01Update draft release notes to 1.8.2.1Junio C Hamano1-0/+4
2013-04-01Merge branch 'ap/maint-diff-rename-avoid-overlap' into maintJunio C Hamano2-1/+67
2013-04-01Merge branch 'rr/tests-dedup-test-config' into maintJunio C Hamano2-10/+0
2013-04-01Merge branch 'yd/doc-is-in-asciidoc' into maintJunio C Hamano1-0/+3
2013-04-01Merge branch 'yd/doc-merge-annotated-tag' into maintJunio C Hamano2-1/+26
2013-04-01Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano9-4/+46
2013-04-01Merge branch 'da/downcase-u-in-usage' into maintJunio C Hamano25-82/+82
2013-04-01submodule summary: support --summary-limit=<n>René Scharfe1-6/+11
2013-03-29cat-file: Fix an gcc -Wuninitialized warningRamsay Jones1-1/+1
2013-03-29fast-import: Fix an gcc -Wuninitialized warningRamsay Jones1-0/+1
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-28Merge branch 'maint-1.8.1' into maintJunio C Hamano1-1/+1
2013-03-28git help config: s/insn/instruction/Matthias Krüger1-1/+1
2013-03-27More fixes for 1.8.2.1Junio C Hamano1-0/+3
2013-03-27Merge branch 'maint-1.8.1' into maintJunio C Hamano3-2/+4
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-26More corrections for 1.8.2.1Junio C Hamano1-0/+39
2013-03-26Merge branch 'maint-1.8.1' into maintJunio C Hamano1-3/+6
2013-03-26Merge branch 'we/submodule-update-prefix-output' into maintJunio C Hamano2-14/+20
2013-03-26Merge branch 'jk/mailsplit-maildir-muttsort' into maintJunio C Hamano1-0/+23
2013-03-26Merge branch 'rs/zip-compresssed-size-with-export-subst' into maintJunio C Hamano2-1/+7
2013-03-26Merge branch 'jk/utf-8-can-be-spelled-differently' into maintJunio C Hamano1-2/+18
2013-03-26Merge branch 'nd/branch-error-cases' into maintJunio C Hamano2-0/+48
2013-03-26Merge branch 'ap/maint-update-index-h-is-for-help' into maintJunio C Hamano1-1/+1
2013-03-26Merge branch 'jc/perl-cat-blob' into maintJunio C Hamano1-10/+7
2013-03-26Merge branch 'ob/imap-send-ssl-verify' into maintJunio C Hamano1-0/+11
2013-03-26Merge branch 'nd/index-pack-l10n-buf-overflow' into maintJunio C Hamano1-4/+5
2013-03-26Merge branch 'jc/maint-push-refspec-default-doc' into maintJunio C Hamano1-9/+14
2013-03-26Merge branch 'wk/user-manual-literal-format' into maintJunio C Hamano1-142/+144
2013-03-26Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maintJunio C Hamano3-7/+8
2013-03-26Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maintJunio C Hamano1-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-25Start preparing for 1.8.2.1Junio C Hamano2-1/+30
2013-03-25Merge branch 'jk/graph-c-expose-symbols-for-cgit' into maintJunio C Hamano2-30/+35
2013-03-25Merge branch 'maint-1.8.1' into maintJunio C Hamano10-23/+64
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-25transport.c: help gcc 4.6.3 users by squelching compiler warningJunio C Hamano1-1/+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-21CodingGuidelines: our documents are in AsciiDocJunio C Hamano1-0/+3
2013-03-21diff.c: diff.renamelimit => diff.renameLimit in messageMax Nanasy1-1/+1
2013-03-21wt-status: fix possible use of uninitialized variableJeff King1-1/+4
2013-03-21fast-import: clarify "inline" logic in file_change_mJeff King1-1/+2
2013-03-21run-command: always set failed_errno in start_commandJeff King1-2/+3
2013-03-21transport: drop "int cmp = cmp" hackJeff King1-1/+1
2013-03-21drop some obsolete "x = x" compiler warning hacksJeff King2-2/+2
2013-03-21fast-import: use pointer-to-pointer to keep list tailJeff King1-6/+4
2013-03-20index-pack: always zero-initialize object_entry listJeff King1-0/+2
2013-03-20t2003: work around path mangling issue on WindowsJohannes Sixt1-2/+2
2013-03-19t4018,7810,7811: remove test_config() redefinitionRamkumar Ramachandra3-15/+0
2013-03-19index-pack: guard nr_resolved_deltas reads by lockThomas Rast1-1/+3
2013-03-19index-pack: protect deepest_delta in multithread codeNguyễn Thái Ngọc Duy1-7/+23
2013-03-18pack-refs: add fully-peeled traitMichael Haggerty3-6/+67
2013-03-17Merge branch 'maint'Junio C Hamano1-0/+4
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-17Merge branch 'maint'Junio C Hamano3-38/+31
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-16upload-pack: load non-tip "want" objects from diskJeff King1-2/+2
2013-03-16upload-pack: make sure "want" objects are parsedJeff King2-1/+10
2013-03-16upload-pack: drop lookup-before-parse optimizationJeff King1-3/+1
2013-03-16index-pack: fix buffer overflow caused by translationsNguyễn Thái Ngọc Duy1-4/+5
2013-03-16status: advise to consider use of -u when read_directory takes too longNguyễn Thái Ngọc Duy8-0/+36
2013-03-15git status: document trade-offs in choosing parameters to the -u optionJunio C Hamano1-4/+10
2013-03-14entry: fix filter lookupJohn Keeping2-1/+27
2013-03-14t2003: modernize styleJohn Keeping1-73/+70
2013-03-14setup.c: check that the pathspec magic ends with ")"Andrew Wong1-2/+3
2013-03-14setup.c: stop prefix_pathspec() from looping past the end of stringAndrew Wong1-3/+4
2013-03-13Git 1.8.2v1.8.2Junio C Hamano2-1/+6
2013-03-13tag: --force does not have to warn when creating tagsPhil Hord2-1/+13
2013-03-11Merge branch 'maint'Junio C Hamano1-2/+2
2013-03-11git.c: make usage match manual pageKevin Bracey1-2/+2
2013-03-11Merge branch 'mp/complete-paths'Junio C Hamano1-5/+11
2013-03-11Merge branch 'mm/add-u-A-finishing-touches'Junio C Hamano1-3/+3
2013-03-11git-completion.bash: zsh does not implement function redirection correctlyMatthieu Moy1-5/+11
2013-03-11Merge branch 'gp/add-u-A-documentation'Junio C Hamano1-10/+12
2013-03-11add: update pathless 'add [-u|-A]' warning to reflect change of planMatthieu Moy1-3/+3
2013-03-10Merge branch 'maint'Junio C Hamano1-1/+1
2013-03-10archive: handle commits with an empty treeJeff King3-1/+103
2013-03-10test-lib: factor out $GIT_UNZIP setupJeff King3-12/+6
2013-03-10Translate git_more_info_string consistentlyKevin Bracey1-1/+1
2013-03-09Merge branch 'maint'Junio C Hamano1-1/+1
2013-03-09perf: update documentation of GIT_PERF_REPEAT_COUNTAntoine Pelisse1-1/+1
2013-03-09format-patch: RFC 2047 says multi-octet character may not be splitKirill Smelkov4-25/+77
2013-03-08Merge git://git.bogomips.org/git-svnJunio C Hamano1-1/+6
2013-03-08Update draft release notes to 1.8.2Junio C Hamano1-26/+34
2013-03-08setup: suppress implicit "." work-tree for bare reposJeff King5-0/+41
2013-03-08environment: add GIT_PREFIX to local_repo_envJeff King3-2/+4
2013-03-08bundle: Add colons to list headings in "verify"Lukas Fleischer1-4/+4
2013-03-08Documentation/git-push: clarify the description of defaultsJunio C Hamano1-9/+14
2013-03-08cache.h: drop LOCAL_REPO_ENV_SIZEJeff King2-10/+8
2013-03-08git svn: consistent spacing after "W:" in warningsEric Wong1-1/+1
2013-03-08git svn: ignore partial svn:mergeinfoJan Pešta1-0/+5
2013-03-07bundle: Fix "verify" output if history is completeLukas Fleischer1-1/+1
2013-03-07Git 1.8.2-rc3v1.8.2-rc3Junio C Hamano1-1/+1
2013-03-07Merge git://github.com/git-l10n/git-poJunio C Hamano5-27/+29
2013-03-07Merge branch 'mp/complete-paths'Junio C Hamano1-0/+9
2013-03-07Merge branch 'maint'Junio C Hamano1-3/+0
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-07add: Clarify documentation of -A and -uGreg Price1-10/+12
2013-03-07l10n: zh_CN.po: translate 1 new messageJiang Xin1-4/+4
2013-03-06tests: make sure rename pretty print worksAntoine Pelisse1-0/+54
2013-03-06l10n: de.po: translate 1 new messageRalf Thielow1-7/+9
2013-03-06l10n: vi.po: Update translation (2009t0f0u)Tran Ngoc Quan1-10/+10
2013-03-05reflog: fix typo in "reflog expire" clean-up codepathJunio C Hamano1-1/+1
2013-03-05git-completion.zsh: define __gitcomp_file compatibility functionMatthieu Moy1-0/+9
2013-03-05l10n: Update Swedish translation (2009t0f0u)Peter Krefting1-4/+4
2013-03-05l10n: git.pot: v1.8.2 round 4 (1 changed)Jiang Xin1-2/+2
2013-03-04Merge git://github.com/git-l10n/git-poJunio C Hamano1-636/+821
2013-03-03submodule update: when using recursion, show full pathWilliam Entriken2-14/+20
2013-03-03Revert "graph.c: mark private file-scope symbols as static"John Keeping2-30/+35
2013-03-03Git 1.8.2-rc2v1.8.2-rc2Junio C Hamano2-5/+27
2013-03-02mailsplit: sort maildir filenames more cleverlyJeff King1-0/+23
2013-03-01Sync with 1.8.1.5Junio C Hamano5-6/+16
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-28describe: --match=<pattern> must limit the refs even when used with --allJunio C Hamano1-21/+20
2013-02-27name-hash.c: fix endless loop with core.ignorecase=trueKarsten Blees4-62/+166
2013-02-27Merge branch 'maint'Junio C Hamano2-3/+8
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-27Merge branch 'mh/maint-ceil-absolute'Junio C Hamano3-16/+52
2013-02-27archive-zip: fix compressed size for stored export-subst filesRené Scharfe2-1/+7
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-26Merge branch 'for-junio' of git://github.com/kusma/gitJunio C Hamano1-131/+75
2013-02-26Revert "compat: add strtok_r()"Erik Faye-Lund5-80/+0
2013-02-26wincred: improve compatibility with windows versionsKarsten Blees1-129/+70
2013-02-26wincred: accept CRLF on stdin to simplify console usageKarsten Blees1-2/+5
2013-02-26l10n: de.po: correct translation of "bisect" messagesRalf Thielow1-9/+9
2013-02-26l10n: de.po: translate 5 new messagesRalf Thielow1-109/+145
2013-02-26l10n: de.po: translate 35 new messagesRalf Thielow1-618/+767
2013-02-25user-manual: Standardize backtick quotingW. Trevor King1-142/+144
2013-02-25utf8: accept alternate spellings of UTF-8Jeff King1-2/+18
2013-02-25git-compat-util.h: Provide missing netdb.h definitionsDavid Michael2-4/+11
2013-02-25Git 1.8.2-rc1v1.8.2-rc1Junio C Hamano2-14/+10
2013-02-25Merge git://github.com/git-l10n/git-poJunio C Hamano4-948/+1200
2013-02-25Sync with 'maint'Junio C Hamano3-2/+39
2013-02-25Merge branch 'wk/user-manual'Junio C Hamano1-56/+77
2013-02-25Merge branch 'jn/less-reconfigure'Junio C Hamano1-6/+8
2013-02-25Merge branch 'as/check-ignore'Junio C Hamano3-3/+18
2013-02-25Merge branch 'ct/autoconf-htmldir'Junio C Hamano1-0/+2
2013-02-25Merge branch 'wk/man-deny-current-branch-is-default-these-days'Junio C Hamano1-1/+1