summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-04-03Git 1.7.10-rc4v1.7.10-rc4Junio C Hamano2-8/+8
2012-04-02Merge branch 'pt/gitk'Junio C Hamano1-1/+2
2012-04-02Sync with 1.7.9.6Junio C Hamano3-6/+17
2012-04-02Git 1.7.9.6v1.7.9.6Junio C Hamano4-4/+18
2012-04-02Merge branch 'jc/maint-merge-autoedit' into maintJunio C Hamano2-3/+40
2012-04-02gitk: fix setting font display with new tabbed dialog layout.Pat Thoyts1-1/+1
2012-04-02gitk: fix tabbed preferences construction when using tcl 8.4Pat Thoyts1-0/+1
2012-04-02Merge git://github.com/git-l10n/git-poJunio C Hamano4-19/+7103
2012-04-02l10n: Add the Dutch translation team and initialize nl.poVincent van Ravesteijn2-0/+3497
2012-04-02l10n: Inital Portuguese Portugal language (pt_PT)Marco Sousa2-0/+3587
2012-03-30Merge branch 'maint'Junio C Hamano1-1/+3
2012-03-30string-list: document that string_list_insert() inserts unique stringsHeiko Voigt1-1/+3
2012-03-30l10n: Improve zh_CN translation for Git 1.7.10-rc3Jiang Xin1-19/+19
2012-03-28config: remove useless assignmentRené Scharfe1-2/+0
2012-03-28Git 1.7.10-rc3v1.7.10-rc3Junio C Hamano2-11/+11
2012-03-28correct a few doubled-word nits in comments and documentationJim Meyering4-4/+4
2012-03-28correct spelling: an URL -> a URLJim Meyering8-9/+9
2012-03-27l10n updates for Git 1.7.10-rc1Junio C Hamano4-292/+310
2012-03-27tests: unset COLUMNS inherited from environmentZbigniew Jędrzejewski-Szmek1-1/+1
2012-03-27Add url of Swedish l10n team in TEAMS fileJiang Xin1-0/+1
2012-03-27l10n: Review zh_CN translation for Git 1.7.10-rc1Jiang Xin1-250/+252
2012-03-27Update Swedish translation (724t0f0u).Peter Krefting1-18/+23
2012-03-26Update draft release notes to 1.7.10Junio C Hamano1-21/+7
2012-03-26Sync with 1.7.9.5Junio C Hamano4-3/+38
2012-03-26Git 1.7.9.5v1.7.9.5Junio C Hamano4-3/+27
2012-03-26Merge branch 'jn/maint-fast-import-empty-ls' into maintJunio C Hamano2-0/+43
2012-03-26Merge branch 'ph/rerere-doc' into maintJunio C Hamano1-7/+12
2012-03-26Merge branch 'ms/maint-config-error-at-eol-linecount' into maintJunio C Hamano2-4/+40
2012-03-26grep doc: add --break / --heading / -W to synopsisMark Lodato1-0/+2
2012-03-26Documentation: improve description of GIT_EDITOR and preference orderRodrigo Silva (MestreLion)1-0/+6
2012-03-26documentation: fix alphabetic ordered list for git-rebase man pageNelson Benitez Leon1-2/+5
2012-03-24Merge gitk changes from Paul Mackerras at git://ozlabs.org/~paulus/gitkJunio C Hamano1-130/+282
2012-03-24gitk: Teach gitk to respect log.showrootMarcus Karlsson1-1/+9
2012-03-23Git 1.7.10-rc2v1.7.10-rc2Junio C Hamano2-2/+18
2012-03-23.mailmap: unify various old mail addresses of gitsterJunio C Hamano1-1/+7
2012-03-23Merge branch 'am/completion-zsh-fix'Junio C Hamano1-1/+2
2012-03-23Merge branch 'dw/gitweb-doc-grammo'Junio C Hamano1-2/+2
2012-03-23Documentation/gitweb: trivial English fixesD Waitzman1-2/+2
2012-03-23gitk: Add menu items for comparing a commit with the marked commitPaul Mackerras1-9/+29
2012-03-21contrib/completion: "local var=()" is misinterpreted as func-decl by zshAlex Merry1-1/+2
2012-03-20Merge branch 'maint'Junio C Hamano0-0/+0
2012-03-20Merge branch 'maint-1.7.8' into maintJunio C Hamano5-16/+34
2012-03-20merge: backport GIT_MERGE_AUTOEDIT supportJunio C Hamano2-3/+40
2012-03-20Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8Junio C Hamano1-3/+3
2012-03-20Merge branch 'jc/advise-i18n' into maint-1.7.8Junio C Hamano2-12/+20
2012-03-20Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8Junio C Hamano2-1/+11
2012-03-19gitk: Speed up resolution of short SHA1 idsPaul Mackerras1-5/+27
2012-03-19gitk: Use symbolic font names "sans" and "monospace" when availableJonathan Nieder1-0/+5
2012-03-19gitk: Skip over AUTHOR/COMMIT_DATE when searching all fieldsFrédéric Brière1-2/+4
2012-03-19gitk: Make "git describe" output clickable, tooJim Meyering1-1/+5
2012-03-19gitk: Fix the display of files when filtered by pathPat Thoyts1-11/+27
2012-03-19gitk: Use a tabbed dialog to edit preferencesPat Thoyts1-100/+164
2012-03-19gitk: Use "gitk: repo-top-level-dir" as window titleZbigniew Jędrzejewski-Szmek1-1/+12
2012-03-16Merge branch 'ab/perl-i18n'Junio C Hamano2-3/+15
2012-03-16perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKERÆvar Arnfjörð Bjarmason1-2/+5
2012-03-16Update draft release notes to 1.7.10Junio C Hamano1-1/+10
2012-03-16Merge branch 'th/mergetools-deltawalker'Junio C Hamano1-2/+3
2012-03-16Merge branch 'jc/maint-verify-objects-remove-pessimism'Junio C Hamano1-4/+4
2012-03-16Merge branch 'sl/customize-sane-tool-path'Junio C Hamano1-0/+17
2012-03-16Merge "two fixes for fast-import's 'ls' command" from JonathanJunio C Hamano2-0/+43
2012-03-16l10n: Update zh_CN translation for Git 1.7.10-rc1Jiang Xin1-12/+17
2012-03-16l10n: Update git.pot (1 new message)Jiang Xin1-12/+17
2012-03-16Merge v1.7.10-rc0 for git l10n updateJiang Xin21-105/+265
2012-03-15Merge branch 'th/git-diffall'Junio C Hamano1-28/+24
2012-03-15Merge branch 'th/doc-diff-submodule-option'Junio C Hamano1-5/+6
2012-03-15fetch/receive: remove over-pessimistic connectivity checkJunio C Hamano1-4/+4
2012-03-15Documentation/difftool: add deltawalker to list of valid diff toolsTim Henigan1-2/+3
2012-03-14Git 1.7.10-rc1v1.7.10-rc1Junio C Hamano2-4/+12
2012-03-14contrib/diffall: fix cleanup trap on WindowsTim Henigan1-4/+3
2012-03-14contrib/diffall: eliminate duplicate while loopsTim Henigan1-15/+9
2012-03-14contrib/diffall: eliminate use of tarTim Henigan1-4/+8
2012-03-14contrib/diffall: create tmp dirs without mktempTim Henigan1-7/+4
2012-03-14contrib/diffall: comment actual reason for 'cdup'Tim Henigan1-1/+3
2012-03-14Documentation/diff-options: reword description of --submodule optionTim Henigan1-5/+6
2012-03-13Merge branch 'jc/i18n-shell-script-gettext'Junio C Hamano1-1/+1
2012-03-13Merge branch 'jc/maint-undefined-i18n-observation-test'Junio C Hamano1-14/+23
2012-03-13Merge branch 'ms/maint-config-error-at-eol-linecount'Junio C Hamano2-4/+40
2012-03-13Merge branch 'ph/rerere-doc'Junio C Hamano1-7/+12
2012-03-13am: officially deprecate -b/--binary optionJunio C Hamano2-4/+4
2012-03-12Update draft release notes to 1.7.10 before -rc1Junio C Hamano1-21/+12
2012-03-12Merge branch 'az/verify-tag-use-gpg-config'Junio C Hamano1-1/+9
2012-03-12Sync with 1.7.9.4Junio C Hamano2-1/+26
2012-03-12Git 1.7.9.4v1.7.9.4Junio C Hamano4-3/+28
2012-03-12Merge branch 'tr/maint-bundle-boundary' into maintJunio C Hamano2-23/+36
2012-03-12Merge branch 'jc/maint-diff-patch-header' into maintJunio C Hamano2-86/+111
2012-03-12Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into maintJunio C Hamano1-8/+8
2012-03-12Merge branch 'jc/am-3-nonstandard-popt' into maintJunio C Hamano2-4/+22
2012-03-12git-am: error out when seeing -b/--binaryThomas Rast1-1/+3
2012-03-12i18n: fix auto detection of gettext scheme for shell scriptsJunio C Hamano1-1/+1
2012-03-12config: report errors at the EOL with correct line numberMartin Stenberg2-4/+40
2012-03-12Merge https://github.com/git-l10n/git-poJunio C Hamano4-358/+4239
2012-03-10Git::I18N: compatibility with perl <5.8.3Ævar Arnfjörð Bjarmason1-1/+10
2012-03-09fast-import: don't allow 'ls' of path with empty componentsJonathan Nieder2-0/+41
2012-03-09fast-import: leakfix for 'ls' of dirty treesJonathan Nieder1-0/+2
2012-03-09t0204: clarify the "observe undefined behaviour" testJunio C Hamano1-14/+23
2012-03-09configure: allow user to prevent $PATH "sanitization" on SolarisStefano Lattarini1-0/+17
2012-03-09p4000: use -3000 when promising -3000Thomas Rast1-1/+1
2012-03-08rerere: Document 'rerere remaining'Phil Hord1-7/+12
2012-03-08verify-tag: Parse GPG configuration options.Alex Zepeda1-1/+9
2012-03-08Update draft release notes to 1.7.10Junio C Hamano1-10/+28
2012-03-08Merge branch 'kb/maint-prune-rmdir-closedir'Junio C Hamano2-3/+3
2012-03-08Merge branch 'jl/maint-submodule-relative'Junio C Hamano3-29/+68
2012-03-08Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext'Junio C Hamano1-9/+9
2012-03-08Merge branch 'vr/branch-doc'Junio C Hamano1-9/+10
2012-03-08perf: export some important test-lib variablesThomas Rast2-1/+14
2012-03-08perf: load test-lib-functions from the correct directoryThomas Rast2-1/+6
2012-03-09l10n: Improve zh_CN translation for msg "not something we can merge"Thynson1-1/+1
2012-03-09l10n: Improve zh_CN trans for msg that cannot fast-forwardThynson1-1/+1
2012-03-08l10n: Update zh_CN translation for 1.7.10-rc0Jiang Xin1-169/+177
2012-03-08Update Swedish translation (732t0f0u).Peter Krefting2-1396/+1767
2012-03-08po/sv.po: add Swedish translationPeter Krefting1-0/+3492
2012-03-08l10n: Update git.pot (1 new message)Jiang Xin1-169/+175
2012-03-08Merge v1.7.10-rc0 for git l10n updateJiang Xin72-683/+2034
2012-03-07Git 1.7.10-rc0v1.7.10-rc0Junio C Hamano2-6/+58
2012-03-07Merge branch 'jc/pickaxe-ignore-case'Junio C Hamano7-10/+170
2012-03-07fix deletion of .git/objects sub-directories in git-prune/repackKarsten Blees2-3/+3
2012-03-06Merge branch 'jh/threadable-symlink-check'Junio C Hamano2-2/+28
2012-03-06Merge branch 'jc/maint-diff-patch-header'Junio C Hamano2-86/+111
2012-03-06Merge branch 'th/mergetools-deltawalker'Junio C Hamano1-0/+21
2012-03-06Merge branch 'cn/pull-rebase-message'Junio C Hamano4-29/+24
2012-03-06Merge branch 'sl/modern-t0000'Junio C Hamano1-274/+289
2012-03-06Merge branch 'nl/http-proxy-auth'Junio C Hamano1-1/+3
2012-03-06Merge branch 'tr/maint-bundle-boundary'Junio C Hamano2-23/+36
2012-03-06Merge branch 'zj/diff-stat-dyncol'Junio C Hamano9-33/+335
2012-03-06Merge branch 'maint'Junio C Hamano2-2/+5
2012-03-06gitweb: Fix fixed string (non-regexp) project searchJakub Narebski1-8/+8
2012-03-06t5704: fix nonportable sed/grep usagesThomas Rast1-2/+2
2012-03-06Merge branch 'maint-1.7.8' into maintJunio C Hamano1-0/+3
2012-03-06Merge branch 'maint-1.7.7' into maint-1.7.8Junio C Hamano1-0/+3
2012-03-06Document the --histogram diff optionThomas Rast1-0/+3
2012-03-06perf: compare diff algorithmsThomas Rast1-0/+29
2012-03-06Documentation/git-branch: add default for --containsVincent van Ravesteijn1-2/+3
2012-03-06Documentation/git-branch: fix a typoVincent van Ravesteijn1-1/+1
2012-03-06Documentation/git-branch: cleanupsVincent van Ravesteijn1-6/+6
2012-03-05Sync with 1.7.9.3Junio C Hamano2-2/+3
2012-03-05Git 1.7.9.3v1.7.9.3Junio C Hamano2-2/+3
2012-03-05Merge branch 'jc/doc-merge-options' into maintJunio C Hamano1-11/+11
2012-03-05Merge branch 'cn/maint-rev-list-doc' into maintJunio C Hamano1-6/+6
2012-03-05fsck doc: a minor typofixJunio C Hamano1-1/+1
2012-03-05fast-import: zero all of 'struct tag' to silence valgrindThomas Rast1-1/+1
2012-03-05mergetools: add a plug-in to support DeltaWalkerTim Henigan1-0/+21
2012-03-04Update draft release notes to 1.7.10Junio C Hamano1-34/+11
2012-03-04Merge branch 'jk/symbolic-ref-short'Junio C Hamano2-4/+14
2012-03-04Merge branch 'jn/gitweb-hilite-regions'Junio C Hamano1-3/+92
2012-03-04Merge branch 'jc/am-3-nonstandard-popt'Junio C Hamano2-4/+22
2012-03-04Make git-{pull,rebase} message without tracking information friendlierCarlos Martín Nieto4-29/+24
2012-03-04Merge branch 'maint'Junio C Hamano5-31/+44
2012-03-04Update draft release notes to 1.7.9.3 for the last timeJunio C Hamano1-0/+27
2012-03-04Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2-0/+8
2012-03-04Merge branch 'jn/maint-gitweb-invalid-regexp' into maintJunio C Hamano2-1/+20
2012-03-04Merge branch 'nd/maint-verify-objects' into maintJunio C Hamano2-25/+18
2012-03-04Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maintJunio C Hamano4-9/+125
2012-03-04Merge branch 'jb/filter-ignore-sigpipe' into maintJunio C Hamano1-0/+5
2012-03-04Merge branch 'sp/smart-http-failure-to-push' into maintJunio C Hamano1-3/+10
2012-03-04Merge branch 'tr/maint-bundle-long-subject' into maintJunio C Hamano5-51/+67
2012-03-05l10n: Update zh_CN translation for 1.7.9.2Jiang Xin1-3/+3
2012-03-04submodules: fix ambiguous absolute paths under WindowsJohannes Sixt1-0/+3
2012-03-04submodules: refactor computation of relative gitdir pathJens Lehmann2-24/+23
2012-03-04submodules: always use a relative path from gitdir to work treeJens Lehmann2-0/+38
2012-03-04submodules: always use a relative path to gitdirJens Lehmann2-7/+6
2012-03-04ctype.c: Fix a sparse warningRamsay Jones2-3/+3
2012-03-04http.proxy: also mention https_proxy and all_proxyClemens Buchacher1-3/+4
2012-03-04parse-options: typo check for unknown switchesRené Scharfe2-0/+12
2012-03-02Add threaded versions of functions in symlinks.c.Jared Hance2-2/+28
2012-03-02t0300: work around bug in dash 0.5.6Michael J Gruber1-1/+4
2012-03-02t5512 (ls-remote): modernize styleTom Grennan1-23/+4
2012-03-02gitweb: Fix passing parameters to git_project_search_formJakub Narebski1-1/+1
2012-03-02t0000: modernise styleStefano Lattarini1-274/+289
2012-03-02tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/shStefano Lattarini1-4/+5
2012-03-02http: support proxies that require authenticationNelson Benitez Leon1-1/+3
2012-03-02Update draft release notes to 1.7.10Junio C Hamano1-12/+21
2012-03-02Merge branch 'maint'Junio C Hamano1-1/+1
2012-03-02Documentation: do not assume that n > 1 in <rev>~$nJunio C Hamano1-1/+1
2012-03-02l10n: Improve commit msg for zh_CN translationThynson1-6/+9
2012-03-02l10n: Improve zh_CN translation for msg that make empty commit when amend.Thynson1-2/+2
2012-03-02l10n: Improve zh_CN translation for empty cherry-pick msg.Thynson1-2/+3
2012-03-02l10n: Improve zh_CN translation for msg about branch deletion denyThynson1-3/+3
2012-03-02l10n: Improve zh_CN translation for lines insertion and deletion.Thynson1-2/+2
2012-03-01Merge branch 'cb/fsck-squelch-dangling'Junio C Hamano5-17/+20
2012-03-01Merge branch 'rs/no-no-no-parseopt'Junio C Hamano8-32/+108
2012-03-01Merge branch 'th/git-diffall'Junio C Hamano2-0/+292
2012-03-01Merge the initial l10n effort inJunio C Hamano6-24/+7265
2012-03-01Merge branch 'master' of https://github.com/git-l10n/git-po into l10nJunio C Hamano1-4/+4
2012-03-01Update l10n guide: change the repository URL, etcJiang Xin2-10/+16
2012-03-01Merge branch 'maint'Junio C Hamano2-7/+12
2012-03-01Merge branch 'nd/maint-verify-objects'Junio C Hamano2-25/+18
2012-03-01Merge branch 'jn/maint-gitweb-invalid-regexp'Junio C Hamano2-1/+20
2012-03-01Merge branch 'cn/maint-rev-list-doc'Junio C Hamano1-6/+6
2012-03-01Merge branch 'cn/maint-branch-with-bad'Junio C Hamano2-0/+8
2012-03-01bundle: keep around names passed to add_pending_object()Thomas Rast2-1/+16
2012-03-01t5510: ensure we stay in the toplevel test dirThomas Rast1-8/+10
2012-03-01t5510: refactor bundle->pack conversionThomas Rast1-14/+10
2012-03-01diff -p: squelch "diff --git" header for stat-dirty pathsJunio C Hamano2-5/+2
2012-03-01t4011: illustrate "diff-index -p" on stat-dirty pathsJunio C Hamano1-7/+39
2012-03-01t4011: modernise styleJunio C Hamano1-86/+82
2012-03-01diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek8-8/+32
2012-03-01diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek4-2/+30
2012-03-01diff --stat: add a test for output with COLUMNS=40Zbigniew Jędrzejewski-Szmek1-0/+19
2012-03-01diff --stat: use a maximum of 5/8 for the filename partZbigniew Jędrzejewski-Szmek3-44/+76
2012-03-01merge --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2-4/+5