summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-05-01Git 1.7.10.1v1.7.10.1Junio C Hamano3-3/+32
2012-05-01Merge branch 'pw/fast-import-dataref-parsing' into maintJunio C Hamano2-33/+364
2012-05-01Merge branch 'it/fetch-pack-many-refs' into maintJunio C Hamano6-6/+162
2012-05-01Merge branch 'jl/maint-submodule-recurse-fetch' into maintJunio C Hamano1-3/+3
2012-05-01Merge branch 'jc/maint-blame-minimal' into maintJunio C Hamano1-0/+1
2012-05-01Merge branch 'lp/maint-diff-three-dash-with-graph' into maintJunio C Hamano3-2/+299
2012-05-01Merge branch 'jk/rebase-i-submodule-conflict-only' into maintJunio C Hamano2-1/+31
2012-05-01Merge branch 'maint' of https://github.com/git-l10n/git-poJunio C Hamano6-282/+7605
2012-05-01l10n: Initial German translationRalf Thielow1-717/+984
2012-04-28l10n: Update Simplified Chinese translationJiang Xin1-84/+100
2012-04-28l10n: Update git.pot (2 new messages)Jiang Xin1-83/+96
2012-04-28Merge maint branch for tracking l10n updates of git stable versionJiang Xin40-213/+779
2012-04-28l10n: Add the German translation team and initialize de.poRalf Thielow2-0/+3508
2012-04-26Start preparing for 1.7.10.1Junio C Hamano2-1/+51
2012-04-26Merge branch 'jk/run-command-eacces' into maintJunio C Hamano6-7/+86
2012-04-26Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2-8/+72
2012-04-26Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maintJunio C Hamano2-11/+43
2012-04-26Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano9-14/+45
2012-04-26Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maintJunio C Hamano1-1/+1
2012-04-26Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano3-24/+65
2012-04-26Merge branch 'jk/add-p-skip-conflicts' into maintJunio C Hamano2-7/+44
2012-04-26Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano5-47/+141
2012-04-26Merge branch 'tr/maint-word-diff-regex-sticky' into maintJunio C Hamano2-56/+102
2012-04-26Merge branch 'jh/notes-merge-in-git-dir-worktree' into maintJunio C Hamano4-32/+73
2012-04-26Sync with 1.7.9.7Junio C Hamano5-4/+55
2012-04-26Git 1.7.9.7v1.7.9.7Junio C Hamano3-2/+16
2012-04-26Sync with 1.7.8.6Junio C Hamano4-3/+40
2012-04-26Git 1.7.8.6v1.7.8.6Junio C Hamano4-3/+27
2012-04-26Sync with 1.7.7.7Junio C Hamano3-2/+16
2012-04-26Git 1.7.7.7v1.7.7.7Junio C Hamano4-3/+18
2012-04-26bundle: remove stray single-quote from error messageJonathan Nieder1-1/+1
2012-04-14submodules: recursive fetch also checks new tags for submodule commitsJens Lehmann1-3/+3
2012-04-12l10n: Add Danish team (da) to list of teamsByrial Jensen1-0/+4
2012-04-12l10n: New da.po file with 0 translationsByrial Jensen1-0/+3503
2012-04-11blame: accept --need-minimalJunio C Hamano1-0/+1
2012-04-11l10n: Updated pt_PT languageMarco Sousa1-115/+127
2012-04-10remote-curl: main test case for the OS command line overflowIvan Todoroski1-0/+31
2012-04-10fetch-pack: test cases for the new --stdin optionIvan Todoroski1-0/+66
2012-04-10remote-curl: send the refs to fetch-pack on stdinIvan Todoroski1-5/+13
2012-04-10fast-import: tighten parsing of datarefsPete Wyckoff2-33/+364
2012-04-10Merge branch 'maint-1.7.9' into maintJunio C Hamano0-0/+0
2012-04-10Merge branch 'maint-1.7.8' into maint-1.7.9Junio C Hamano2-6/+6
2012-04-10test-subprocess: fix segfault without argumentsRené Scharfe1-3/+3
2012-04-10submodule: fix prototype of gitmodules_configRené Scharfe1-1/+1
2012-04-09rebase -i continue: don't skip commits that only change submodulesJohn Keeping2-1/+31
2012-04-09Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8Junio C Hamano1-4/+4
2012-04-09Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8Junio C Hamano1-2/+2
2012-04-09Merge branch 'tr/cache-tree' into maint-1.7.8Junio C Hamano10-11/+142
2012-04-09Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8Junio C Hamano2-4/+33
2012-04-09Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8Junio C Hamano1-6/+6
2012-04-09Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8Junio C Hamano2-23/+36
2012-04-09Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8Junio C Hamano5-51/+67
2012-04-09Merge branch 'ph/rerere-doc' into maint-1.7.8Junio C Hamano1-7/+12
2012-04-06Git 1.7.10v1.7.10Junio C Hamano3-11/+19
2012-04-06spec: add missing build dependencyFelipe Contreras1-0/+1
2012-04-05run-command: treat inaccessible directories as ENOENTJeff King4-3/+80
2012-04-05compat/mingw.[ch]: Change return type of exec functions to intRamsay Jones2-4/+6
2012-04-05push: error out when the "upstream" semantics does not make senseJunio C Hamano2-8/+72
2012-04-05add--interactive: ignore unmerged entries in patch modeJeff King2-7/+44
2012-04-03Documentation/git-commit: rephrase the "initial-ness" of templatesJunio C Hamano1-5/+8
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-02fetch-pack: new --stdin option to read refs from stdinIvan Todoroski3-1/+52
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-04-01git-commit.txt: clarify -t requires editing messageAdam Monsen1-5/+5
2012-03-30Merge branch 'maint'Junio C Hamano1-1/+3
2012-03-30commit: rephrase the error when user did not touch templated log messageJunio C Hamano2-19/+47
2012-03-30commit: do not trigger bogus "has templated message edited" checkJunio C Hamano2-0/+8
2012-03-30t7501: test the right kind of breakageJunio C Hamano1-0/+2
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-25combine-diff: fix loop index underflowRené Scharfe1-1/+1
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-23merge-recursive: don't detect renames of empty filesJeff King2-0/+17
2012-03-23teach diffcore-rename to optionally ignore empty contentJeff King3-1/+12
2012-03-23make is_empty_blob_sha1 available everywhereJeff King2-10/+13
2012-03-23drop casts from users EMPTY_TREE_SHA1_BINJeff King3-3/+3
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-20t4202: add test for "log --graph --stat -p" separator linesLucian Poston1-0/+290
2012-03-20log --graph: fix break in graph linesLucian Poston1-0/+6
2012-03-20log --graph --stat: three-dash separator should come after graph linesLucian Poston1-2/+3
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-15clean: preserve nested git worktree in subdirectoriesJunio C Hamano2-11/+43
2012-03-15notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdJohan Herland2-8/+13
2012-03-15notes-merge: use opendir/readdir instead of using read_directory()Johan Herland2-21/+31
2012-03-15t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/Johan Herland1-0/+19
2012-03-15remove_dir_recursively(): Add flag for skipping removal of toplevel dirJunio C Hamano2-4/+11
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-14diff: tweak a _copy_ of diff_options with word-diffThomas Rast2-2/+5
2012-03-14diff: refactor the word-diff setup from builtin_diff_cmdThomas Rast1-56/+63
2012-03-14t4034: diff.*.wordregex should not be "sticky" in --word-diffJohannes Sixt1-0/+36
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-11commit: pass author/committer info to hooksJunio C Hamano2-4/+20
2012-03-11t7503: does pre-commit-hook learn authorship?Junio C Hamano1-0/+18
2012-03-11ident.c: add split_ident_line() to parse formatted ident lineJunio C Hamano3-44/+104
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