summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-06-03Git 1.7.11-rc1v1.7.11-rc1Junio C Hamano2-7/+2
2012-06-03Sync with 1.7.10.4Junio C Hamano2-1/+6
2012-06-03Git 1.7.10.4v1.7.10.4Junio C Hamano2-1/+6
2012-06-03Merge branch 'ef/maint-rebase-error-message' into maintJunio C Hamano2-1/+6
2012-06-01Update draft release notes to 1.7.11Junio C Hamano1-18/+14
2012-06-01Merge branch 'ef/maint-rebase-error-message'Junio C Hamano2-1/+6
2012-06-01Merge branch 'nh/empty-rebase'Junio C Hamano2-28/+75
2012-06-01Merge branch 'vr/rebase-autosquash-does-not-imply-i'Junio C Hamano1-0/+1
2012-06-01Merge branch 'mm/levenstein-penalize-deletion-less'Junio C Hamano1-1/+1
2012-06-01Merge branch 'jl/submodule-report-new-path-once'Junio C Hamano1-3/+4
2012-06-01Sync with maintJunio C Hamano3-2/+28
2012-06-01Start preparing for 1.7.10.4Junio C Hamano3-2/+28
2012-06-01Merge branch 'ef/http-o-depends-on-gvf' into maintJunio C Hamano1-1/+1
2012-06-01Merge git://github.com/git-l10n/git-poJunio C Hamano6-634/+12887
2012-06-01Merge branch 'rs/maint-grep-F' into maintJunio C Hamano5-24/+68
2012-06-01Merge branch 'jk/ident-split-fix' into maintJunio C Hamano2-1/+8
2012-06-01Merge branch 'jk/pretty-commit-header-incomplete-line' into maintJunio C Hamano1-1/+4
2012-06-01Merge branch 'jk/format-person-part-buffer-limit' into maintJunio C Hamano1-2/+4
2012-06-01Merge branch 'ap/checkout-no-progress-for-non-tty' into maintJunio C Hamano1-2/+2
2012-06-01Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano1-247/+289
2012-06-01i18n: apply: split to fix a partial i18n messageJiang Xin1-4/+12
2012-06-01l10n: Set nplurals of zh_CN.po from 1 to 2Jiang Xin1-10/+42
2012-06-01l10n: zh_CN.po: translate 323 new messagesJiang Xin1-473/+447
2012-05-31Makefile: add missing GIT-VERSION-FILE dependencyErik Faye-Lund1-1/+1
2012-05-31l10n: zh.CN.po: update by msgmerge git.potJiang Xin1-363/+1887
2012-05-31First release translation for VietnameseTran Ngoc Quan1-1818/+2006
2012-05-31Init translation for VietnameseTran Ngoc Quan2-0/+5176
2012-05-30rebase: report invalid commit correctlyErik Faye-Lund2-1/+6
2012-05-30INSTALL: update asciidoc recommendationJeff King1-4/+2
2012-05-30l10n: New it.po file with 504 translationsMarco Paolone2-0/+5148
2012-05-29cherry-pick: regression fix for empty commitsJunio C Hamano2-28/+75
2012-05-29submodules: print "registered for path" message only onceJens Lehmann1-3/+4
2012-05-29Merge git://bogomips.org/git-svnJunio C Hamano4-671/+831
2012-05-29t5701: modernize styleJeff King1-53/+20
2012-05-29Merge branch 'va/git-p4-test'Junio C Hamano1-3/+107
2012-05-29Merge branch 'jk/ident-gecos-strbuf'Junio C Hamano19-238/+176
2012-05-29Merge branch 'jk/fetch-pack-remove-dups-optim'Junio C Hamano3-22/+54
2012-05-29Merge branch 'rs/refs-string-slice'Junio C Hamano1-29/+41
2012-05-29Merge branch 'mh/fetch-pack-constness'Junio C Hamano1-74/+71
2012-05-29Merge branch 'mh/ref-api-lazy-loose'Junio C Hamano1-2/+7
2012-05-29Merge branch 'ng/pack-objects-cleanup'Junio C Hamano2-152/+174
2012-05-29Do not autosquash in case of an implied interactive rebaseVincent van Ravesteijn1-0/+1
2012-05-29Reduce cost of deletion in levenstein distance (4 -> 3)Matthieu Moy1-1/+1
2012-05-29git-p4: Clean up branch test casesVitor Antunes1-3/+1
2012-05-29git-p4: Verify detection of "empty" branch creationVitor Antunes1-0/+54
2012-05-29git-p4: Test changelists touching two branchesVitor Antunes1-0/+52
2012-05-29Merge branch 'maint'Jiang Xin1-247/+289
2012-05-29Update Swedish translation (728t0f0u)Peter Krefting1-247/+289
2012-05-29git-svn: make Git::SVN::Fetcher a separate fileJonathan Nieder3-505/+605
2012-05-29git-svn: rename SVN::Git::* packages to Git::SVN::*Jonathan Nieder1-25/+25
2012-05-29git-svn: move Git::SVN::Prompt into its own fileJonathan Nieder3-144/+204
2012-05-25Git 1.7.11-rc0v1.7.11-rc0Junio C Hamano2-18/+24
2012-05-25Merge branch 'sp/sh-windows-pwd'Junio C Hamano1-20/+21
2012-05-25Merge branch 'mh/test-keep-prove-cache'Junio C Hamano1-2/+4
2012-05-25Merge branch 'rs/dir-strbuf-read-recursive-fix'Junio C Hamano1-16/+9
2012-05-25Merge branch 'fc/git-complete-helper-fix'Junio C Hamano2-6/+18
2012-05-25Merge branch 'ap/checkout-no-progress-for-non-tty'Junio C Hamano1-2/+2
2012-05-25Merge branch 'jk/format-person-part-buffer-limit'Junio C Hamano1-2/+4
2012-05-25Merge branch 'jk/pretty-commit-header-incomplete-line'Junio C Hamano1-1/+4
2012-05-25Merge branch 'jk/ident-split-fix'Junio C Hamano2-1/+8
2012-05-25Merge branch 'rs/xdiff-fast-hash-fix'Junio C Hamano1-15/+15
2012-05-25Merge branch 'mh/ref-api'Junio C Hamano1-0/+6
2012-05-25Merge branch 'rs/maint-grep-F'Junio C Hamano5-24/+68
2012-05-25Sync with 1.7.10.3Junio C Hamano3-10/+21
2012-05-25Git 1.7.10.3v1.7.10.3Junio C Hamano2-5/+16
2012-05-25Merge branch 'hv/submodule-alt-odb' into maintJunio C Hamano4-2/+39
2012-05-25Merge branch 'bp/diff-no-index-strbuf-fix' into maintJunio C Hamano2-2/+27
2012-05-25fmt-merge-message: add empty line between tag and signature verificationLinus Torvalds1-3/+5
2012-05-25config doc: remove confusion about relative GIT_DIR from FILES sectionJonathan Nieder1-3/+1
2012-05-24format-patch: do not use bogus email addresses in message idsJeff King1-1/+1
2012-05-24ident: reject bogus email addresses with IDENT_STRICTJeff King1-0/+6
2012-05-24Sync with maintJunio C Hamano2-2/+11
2012-05-24Update draft release notes to 1.7.10.3Junio C Hamano1-0/+6
2012-05-24Merge branch 'jk/maint-status-porcelain-z-b' into maintJunio C Hamano5-89/+105
2012-05-24ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICTJeff King9-15/+14
2012-05-24format-patch: use GIT_COMMITTER_EMAIL in message idsJeff King1-1/+2
2012-05-24ident: let callers omit name with fmt_indentJeff King2-5/+10
2012-05-24ident: refactor NO_DATE flag in fmt_identJeff King1-6/+9
2012-05-24ident: reword empty ident error messageJeff King1-1/+1
2012-05-24Avoid sorting if references are added to ref_cache in orderMichael Haggerty1-0/+6
2012-05-24checkout: no progress messages if !isatty(2).Avery Pennarun1-2/+2
2012-05-24osxkeychain: pull make config from top-level directoryJeff King1-2/+5
2012-05-24fetch-pack: sort incoming heads list earlierJeff King1-1/+1
2012-05-23Update draft release notes to 1.7.11Junio C Hamano1-0/+13
2012-05-23Merge branch 'rs/archive-tree-in-tip-simplify'Junio C Hamano2-14/+7
2012-05-23Merge branch 'js/rev-parse-doc-fix'Junio C Hamano1-1/+2
2012-05-23Merge branch 'js/rebase-i-p-test-fix'Junio C Hamano1-0/+1
2012-05-23Merge branch 'bp/diff-no-index-strbuf-fix'Junio C Hamano2-2/+27
2012-05-23Merge branch 'hv/submodule-alt-odb'Junio C Hamano4-2/+39
2012-05-23xdiff: import new 32-bit version of count_masked_bytes()René Scharfe1-13/+5
2012-05-23xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe1-1/+7
2012-05-22xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe1-3/+5
2012-05-22refs: do not create ref_entry when searchingJunio C Hamano1-9/+23
2012-05-22refs: use strings directly in find_containing_dir()René Scharfe1-9/+4
2012-05-22refs: convert parameter of create_dir_entry() to length-limited stringRené Scharfe1-8/+10
2012-05-22refs: convert parameter of search_ref_dir() to length-limited stringRené Scharfe1-6/+7
2012-05-22fetch-pack: avoid quadratic loop in filter_refsJeff King1-6/+13
2012-05-22fetch-pack: sort the list of incoming refsJeff King1-0/+2
2012-05-22add sorting infrastructure for list refsJeff King2-0/+24
2012-05-22fetch-pack: avoid quadratic behavior in remove_duplicatesJeff King1-15/+6
2012-05-22fetch-pack: sort incoming headsJeff King1-1/+9
2012-05-22cmd_fetch_pack(): respect constness of argv parameterMichael Haggerty1-13/+10
2012-05-22cmd_fetch_pack(): combine the loop termination conditionsMichael Haggerty1-58/+55
2012-05-22cmd_fetch_pack(): handle non-option arguments outside of the loopMichael Haggerty1-5/+7
2012-05-22cmd_fetch_pack(): declare dest to be constMichael Haggerty1-3/+4
2012-05-22avoid segfault when reading header of malformed commitsJeff King1-1/+4
2012-05-22pretty: avoid buffer overflow in format_person_partJeff King1-2/+4
2012-05-22fix off-by-one error in split_ident_lineJeff King2-1/+8
2012-05-22format-patch: refactor get_patch_filenameJeff King3-38/+20
2012-05-22ident: trim whitespace from default name/emailJeff King1-1/+4
2012-05-22ident: use a dynamic strbuf in fmt_identJeff King1-28/+15
2012-05-22ident: use full dns names to generate email addressesJeff King1-9/+4
2012-05-22ident: report passwd errors with a more friendly messageJeff King5-25/+20
2012-05-22drop length limitations on gecos-derived names and emailsJeff King3-73/+39
2012-05-22ident: don't write fallback username into git_default_nameJeff King1-3/+1
2012-05-22fmt_ident: drop IDENT_WARN_ON_NO_NAME codeJeff King2-10/+6
2012-05-22format-patch: use default email for generating message idsJeff King1-8/+2
2012-05-22ident: trim trailing newline from /etc/mailnameJeff King1-0/+4
2012-05-22move git_default_* variables to ident.cJeff King3-6/+4
2012-05-22move identity config parsing to ident.cJeff King3-23/+23
2012-05-22fmt-merge-msg: don't use static buffer in record_personJeff King1-4/+4
2012-05-22http-push: do not access git_default_email directlyJeff King1-1/+1
2012-05-22ident: split setup_ident into separate functionsJeff King2-16/+22
2012-05-21grep: stop leaking line strings with -fRené Scharfe1-5/+2
2012-05-20remote: fix typoRalf Thielow1-1/+1
2012-05-21l10n: Update git.pot (41 new messages)Jiang Xin1-1/+170
2012-05-20Merge branch 'maint'Junio C Hamano4-4/+5
2012-05-20grep: support newline separated pattern listRené Scharfe4-3/+41
2012-05-20grep: factor out do_append_grep_pat()René Scharfe1-6/+9
2012-05-20grep: factor out create_grep_pat()René Scharfe1-11/+17
2012-05-20free_ref_entry(): do not trigger reading of loose refsMichael Haggerty1-2/+7
2012-05-20Consistently use "superproject" instead of "supermodule"Jens Lehmann3-4/+4
2012-05-20t3404: begin "exchange commits with -p" test with correct preconditionsJohannes Sixt1-0/+1
2012-05-20completion: add support for backwards compatibilityFelipe Contreras1-0/+12
2012-05-20completion: rename internal helpers _git and _gitkFelipe Contreras2-6/+6
2012-05-20t/Makefile: retain cache t/.prove across prove runsMichael Haggerty1-2/+4
2012-05-18pack-objects: refactor write_object() into helper functionsNguyễn Thái Ngọc Duy1-150/+172
2012-05-18pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .."Nguyễn Thái Ngọc Duy2-2/+2
2012-05-18Fix t3411.3 to actually rebase somethingJohannes Sixt1-0/+1
2012-05-18rev-parse doc: --git-dir does not always show a relative pathJon Seymour1-1/+2
2012-05-18archive-tar: keep const in checksum calculationRené Scharfe1-2/+2
2012-05-18archive: simplify refname handlingRené Scharfe1-12/+5
2012-05-17Merge git://github.com/git-l10n/git-poJunio C Hamano4-941/+2332
2012-05-17Merge branch 'nd/i18n-parseopt'Junio C Hamano3-50/+56
2012-05-17Merge branch 'rs/xdiff-lose-emit-func'Junio C Hamano7-119/+51
2012-05-17Merge branch 'fc/git-complete-helper'Junio C Hamano2-38/+34
2012-05-17Merge branch 'ld/git-p4-tags-and-labels'Junio C Hamano2-3/+23
2012-05-17git-svn: clarify the referent of dcommit's optional argumentJon Seymour1-20/+19
2012-05-16git-svn: support rebase --preserve-mergesAvishay Lavie2-1/+5
2012-05-16diff --no-index: don't leak buffers in queue_diffBobby Powers1-2/+2
2012-05-16diff --no-index: reset temporary buffer lengths on directory iterationBobby Powers2-0/+25
2012-05-16git-sh-setup: define workaround wrappers before they are usedJunio C Hamano1-20/+21
2012-05-16Merge branch 'maint' into masterJiang Xin2-130/+116
2012-05-15l10n: de.po: translate 3 new messagesRalf Thielow1-101/+127
2012-05-15l10n: zh_CN.po: translate 3 new messagesJiang Xin1-99/+121
2012-05-15Merge branch 'master' of git://github.com/marcomsousa/git-l10n-pt_PTJiang Xin1-585/+1970
2012-05-15l10n: pt_PT.po translate new messagesMarco Sousa1-585/+1970
2012-05-15l10n: Update git.pot (8 new, 4 removed messages)Jiang Xin1-226/+246
2012-05-15Merge branch 'maint'Jiang Xin0-0/+0
2012-05-15l10n: Update git.pot (3 new, 2 removed messages)Jiang Xin1-96/+108
2012-05-14Update draft release notes for 12th batchJunio C Hamano1-24/+4
2012-05-14teach add_submodule_odb() to look for alternatesHeiko Voigt4-2/+39
2012-05-14Merge branch 'fc/simplify-complete-revlist-file'Junio C Hamano1-4/+2
2012-05-14Merge branch 'nd/threaded-index-pack'Junio C Hamano5-67/+331
2012-05-14Sync with maintJunio C Hamano3-5/+31
2012-05-14Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano3-528/+1843
2012-05-14Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano4-515/+538
2012-05-14Start preparing for 1.7.10.3Junio C Hamano2-1/+27
2012-05-14Merge branch 'jk/maint-reflog-walk-count-vs-time' into maintJunio C Hamano7-16/+82
2012-05-14Merge branch 'jk/doc-asciidoc-inline-literal' into maintJunio C Hamano53-194/+192
2012-05-14Merge branch 'ef/checkout-empty' into maintJunio C Hamano2-1/+12
2012-05-14Merge branch 'jk/maint-tformat-with-z' into maintJunio C Hamano2-1/+29
2012-05-14Merge branch 'js/checkout-detach-count' into maintJunio C Hamano2-11/+23
2012-05-14Merge branch 'ef/maint-clone-progress-fix' into maintJunio C Hamano1-1/+1
2012-05-14link to gitmodules page at the beginning of git-submodule documentationHeiko Voigt1-3/+3
2012-05-14completion: add new __git_complete helperFelipe Contreras2-38/+34
2012-05-14builtin/blame.c: Fix a "Using plain integer as NULL pointer" warningRamsay Jones1-1/+1
2012-05-14pack-protocol: fix first-want separator in the examplesCarlos Martín Nieto1-2/+2
2012-05-12Merge branch 'maint'Jiang Xin0-0/+0
2012-05-12l10n: zh_CN.po: translate 1 new messageJiang Xin1-94/+98
2012-05-11dir: simplify fill_directory()René Scharfe1-8/+1
2012-05-11dir: respect string length argument of read_directory_recursive()René Scharfe1-8/+8
2012-05-11git p4: fix bug when enabling tag import/export via config variablesLuke Diamand1-2/+2
2012-05-11git p4: fix bug when verbose enabled with tag exportLuke Diamand1-1/+1
2012-05-11git p4: add test for tag import/export enabled via configLuke Diamand1-0/+20
2012-05-11Update draft release notes to 1.7.11 (11th batch)Junio C Hamano1-13/+8
2012-05-11Merge branch 'ef/checkout-empty'Junio C Hamano2-1/+12
2012-05-11Merge branch 'jk/maint-reflog-walk-count-vs-time'Junio C Hamano7-16/+82
2012-05-11Merge branch 'nd/i18n-branch-lego'Junio C Hamano1-9/+23
2012-05-11Sync with 1.7.10.2Junio C Hamano4-7/+22
2012-05-11Git 1.7.10.2v1.7.10.2Junio C Hamano3-2/+17
2012-05-11Merge branch 'jc/diff-algo-cleanup' into maintJunio C Hamano8-25/+24
2012-05-11Merge branch 'ct/advise-push-default' into maintJunio C Hamano10-13/+99
2012-05-11Merge branch 'js/fast-import-test-9300' into maintJunio C Hamano1-34/+54
2012-05-11Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maintJunio C Hamano7-53/+107
2012-05-11Merge branch 'ah/maint-grep-double-init' into maintJunio C Hamano1-1/+1
2012-05-11Merge branch 'fa/maint-config-doc' into maintJunio C Hamano1-5/+9
2012-05-11Merge branch 'rs/unpack-trees-leakfix' into maintJunio C Hamano1-10/+17
2012-05-11Merge branch 'sl/test-wc-l-line-count' into maintJunio C Hamano19-74/+65
2012-05-11Merge branch 'rl/show-empty-prefix' into maintJunio C Hamano2-1/+3