summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-04-26Git 1.8.2.2v1.8.2.2Junio C Hamano3-2/+21
2013-04-26Merge branch 'jk/a-thread-only-dies-once' into maintJunio C Hamano3-6/+26
2013-04-26Merge branch 'jn/gitweb-install-doc' into maintJunio C Hamano2-8/+12
2013-04-26Merge branch 'fc/untracked-zsh-prompt' into maintJunio C Hamano1-1/+1
2013-04-26Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maintJunio C Hamano1-1/+4
2013-04-26Merge branch 'jk/chopped-ident' into maintJunio C Hamano5-99/+75
2013-04-26Merge branch 'rt/commentchar-fmt-merge-msg' into maintJunio C Hamano2-7/+29
2013-04-26Merge branch 'rs/empty-archive' into maintJunio C Hamano1-1/+1
2013-04-26Merge branch 'pe/pull-rebase-v-q' into maintJunio C Hamano2-1/+28
2013-04-26t7409: do not use export X=YTorsten Bögershausen1-4/+10
2013-04-26test-hg-hg-git.sh: do not use export X=YTorsten Bögershausen1-4/+6
2013-04-26test-hg-bidi.sh: do not use export X=YTorsten Bögershausen1-5/+6
2013-04-26t9501: do not use export X=YTorsten Bögershausen1-5/+10
2013-04-26t9020: do not use export X=YTorsten Bögershausen1-1/+2
2013-04-24Update draft release notes to 1.8.2.2Junio C Hamano1-0/+18
2013-04-24Merge branch 'jk/diff-algo-finishing-touches' into maintJunio C Hamano2-2/+9
2013-04-24Merge branch 'sr/log-SG-no-textconv' into maintJunio C Hamano2-72/+86
2013-04-24Merge branch 'jc/merge-tag-object' into maintJunio C Hamano2-32/+81
2013-04-24completion: remove duplicate block for "git commit -c"Mårten Kongstad1-7/+0
2013-04-24cherry-pick/revert: make usage say '<commit-ish>...'Kevin Bracey1-2/+2
2013-04-22Start preparing for 1.8.2.2Junio C Hamano2-1/+26
2013-04-22Merge branch 'ta/glossary' into maintJunio C Hamano32-111/+89
2013-04-22Merge branch 'jk/doc-http-backend' into maintJunio C Hamano3-1/+129
2013-04-22Merge branch 'jk/test-trash' into maintJunio C Hamano1-9/+9
2013-04-22Merge branch 'jk/daemon-user-doc' into maintJunio C Hamano1-0/+7
2013-04-22Merge branch 'jc/detached-head-doc' into maintJunio C Hamano1-3/+16
2013-04-22Merge branch 'jk/show-branch-strbuf' into maintJunio C Hamano1-9/+8
2013-04-22Merge branch 'js/rerere-forget-protect-against-NUL' into maintJunio C Hamano2-10/+36
2013-04-22Merge branch 'jc/apply-ws-fix-tab-in-indent' into maintJunio C Hamano4-7/+41
2013-04-22Merge branch 'ap/combine-diff-ignore-whitespace' into maintJunio C Hamano2-7/+161
2013-04-22Merge branch 'jk/suppress-clang-warning' into maintJunio C Hamano2-2/+4
2013-04-22Merge branch 'tr/perl-keep-stderr-open' into maintJunio C Hamano2-4/+5
2013-04-22Merge branch 'lf/bundle-with-tip-wo-message' into maintJunio C Hamano2-1/+11
2013-04-22Merge branch 'jk/filter-branch-come-back-to-original' into maintJunio C Hamano2-2/+17
2013-04-22Merge branch 'rr/prompt-revert-head' into maintJunio C Hamano1-0/+2
2013-04-21prompt: fix untracked files for zshFelipe Contreras1-1/+1
2013-04-19receive-pack: close sideband fd on early pack errorsJeff King1-1/+4
2013-04-18t6200: avoid path mangling issue on WindowsJohannes Sixt1-3/+3
2013-04-17remote-hg: fix commit messagesFelipe Contreras1-1/+2
2013-04-17gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibilityJonathan Nieder1-0/+7
2013-04-17blame: handle broken commit headers gracefullyRené Scharfe1-3/+8
2013-04-17pretty: handle broken commit headers gracefullyRené Scharfe2-21/+66
2013-04-17cat-file: print tags raw for "cat-file -p"Jeff King2-75/+1
2013-04-16run-command: use thread-aware die_is_recursing routineJeff King1-0/+11
2013-04-16usage: allow pluggable die-recursion checksJeff King2-6/+15
2013-04-16help.c: add a compatibility comment to cmd_version()David Aguilar1-0/+4
2013-04-15glossary: improve definitions of refspec and pathspecThomas Ackermann1-23/+10
2013-04-15The name of the hash function is "SHA-1", not "SHA1"Thomas Ackermann31-68/+68
2013-04-15glossary: improve description of SHA-1 related topicsThomas Ackermann1-10/+10
2013-04-15glossary: remove outdated/misleading/irrelevant entriesThomas Ackermann1-10/+1
2013-04-15gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEMJakub Narębski1-8/+5
2013-04-14t/test-lib.sh: drop "$test" variableJeff King1-5/+5
2013-04-14t/test-lib.sh: fix TRASH_DIRECTORY handlingJohn Keeping1-4/+4
2013-04-13doc/http-backend: match query-string in apache half-auth exampleJeff King3-8/+72
2013-04-12Merge branch 'rr/test-3200-style' into maintJunio C Hamano1-253/+267
2013-04-12Merge branch 'mg/texinfo-5' into maintJunio C Hamano1-0/+1
2013-04-12Merge branch 'jk/diffcore-break-divzero' into maintJunio C Hamano1-0/+3
2013-04-12Merge branch 'cn/commit-amend-doc' into maintJunio C Hamano1-8/+9
2013-04-12Merge branch 'jk/bisect-prn-unsigned' into maintJunio C Hamano1-2/+2
2013-04-12Merge branch 'jk/no-more-self-assignment' into maintJunio C Hamano2-47/+34
2013-04-12Merge branch 'rr/send-email-perl-critique' into maintJunio C Hamano1-8/+10
2013-04-12Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maintJunio C Hamano1-3/+3
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini24-33/+33
2013-04-12kwset: fix spelling in commentsStefano Lattarini1-2/+2
2013-04-12precompose-utf8: fix spelling of "want" in error messageStefano Lattarini1-1/+1
2013-04-12compat/nedmalloc: fix spelling in commentsStefano Lattarini1-3/+3
2013-04-12compat/regex: fix spelling and grammar in commentsStefano Lattarini3-6/+6
2013-04-12obstack: fix spelling of similarStefano Lattarini1-1/+1
2013-04-12contrib/subtree: fix spelling of accidentallyStefano Lattarini1-1/+1
2013-04-12git-remote-mediawiki: spelling fixesStefano Lattarini4-14/+14
2013-04-12doc: various spelling fixesStefano Lattarini10-13/+13
2013-04-12Merge branch 'maint-1.8.1' into maintJunio C Hamano2-3/+5
2013-04-12doc: clarify that "git daemon --user=<user>" option does not export HOME=~userJunio C Hamano1-0/+7
2013-04-12fast-export: fix argument name in error messagesPaul Price1-2/+2
2013-04-12Documentation: distinguish between ref and offset deltas in pack-formatStefan Saasen1-1/+3
2013-04-12Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano1-8/+4
2013-04-12i18n: make the translation of -u advice in one goJiang Xin1-8/+4
2013-04-11Typo fix: replacing it's -> itsBenoit Bourbie2-3/+3
2013-04-11t: make PIPE a standard test prerequisiteAdam Spiers4-16/+10
2013-04-11archive: clarify explanation of --worktree-attributesRené Scharfe1-1/+3
2013-04-11doc/http-backend: give some lighttpd config examplesJeff King1-0/+55
2013-04-11doc/http-backend: clarify "half-auth" repo configurationJeff King1-0/+9
2013-04-10t5004: fix issue with empty archive test and bsdtarRené Scharfe1-1/+1
2013-04-09t/README: --immediate skips cleanup commands for failed testsSimon Ruderich1-1/+4
2013-04-07Git 1.8.2.1v1.8.2.1Junio C Hamano3-2/+8
2013-04-07bundle: Accept prerequisites without commit messagesLukas Fleischer2-1/+11
2013-04-07Sync with 1.8.1.6Junio C Hamano6-21/+99
2013-04-07fmt-merge-msg: use core.commentchar in tag signatures completelyRalf Thielow1-4/+8
2013-04-07fmt-merge-msg: respect core.commentchar in people creditsRalf Thielow2-3/+21
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-06show-branch: use strbuf instead of static bufferJeff King1-9/+8
2013-04-05diff: allow unstuck arguments with --diff-algorithmJohn Keeping1-2/+3
2013-04-05git-merge(1): document diff-algorithm option to merge-recursiveJohn Keeping1-0/+6
2013-04-05glossary: extend "detached HEAD" descriptionJunio C Hamano1-3/+16
2013-04-05diffcore-pickaxe: unify code for log -S/-GJeff King1-69/+49
2013-04-05diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>"Junio C Hamano1-5/+7
2013-04-05diffcore-pickaxe: port optimization from has_changes() to diff_grep()Junio C Hamano1-1/+6
2013-04-05diffcore-pickaxe: respect --no-textconvSimon Ruderich2-4/+36
2013-04-05Documentation/git-commit: reword the --amend explanationCarlos Martín Nieto1-8/+9
2013-04-04diffcore-pickaxe: remove fill_one()Jeff King1-20/+10
2013-04-04diffcore-pickaxe: remove unnecessary call to get_textconv()Simon Ruderich1-9/+14
2013-04-04t9700: do not close STDERRThomas Rast1-1/+2
2013-04-04perl: redirect stderr to /dev/null instead of closingThomas Rast1-3/+3
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-04rerere forget: do not segfault if not all stages are presentJohannes Sixt2-8/+20
2013-04-04git-remote-mediawiki: new wiki URL in documentationMatthieu Moy1-1/+1
2013-04-03Documentation: Strip texinfo anchors to avoid duplicatesMartin von Gagern1-0/+1
2013-04-03bisect: avoid signed integer overflowJohn Keeping1-2/+2
2013-04-03diffcore-break: don't divide by zeroJohn Keeping1-0/+3
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-02filter-branch: return to original dir after filteringJeff King2-2/+17
2013-04-02rerere forget: grok files containing NULJohannes Sixt2-2/+16
2013-04-01t6200: test message for merging of an annotated tagJunio C Hamano1-0/+39
2013-04-01t6200: use test_config/test_unconfigJunio C Hamano1-32/+29
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-31send-email: use the three-arg form of open in recipients_cmdRamkumar Ramachandra1-1/+1
2013-03-31send-email: drop misleading function prototypeRamkumar Ramachandra1-4/+6
2013-03-31send-email: use "return;" not "return undef;" on error codepathsRamkumar Ramachandra1-3/+3
2013-03-31bash: teach __git_ps1 about REVERT_HEADRobin Rosenberg1-0/+2
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-29test: resurrect q_to_tabJunio C Hamano1-0/+4
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-28t5516: test interaction between pushURL and pushInsteadOf correctlyJunio C Hamano1-3/+3
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-25match-trees: simplify score_trees() using tree_entry()René Scharfe1-40/+28
2013-03-22Fix revision walk for commits with the same datesKacper Kornet2-1/+14
2013-03-22submodule: clarify logic in show_submodule_summaryJeff King1-7/+6