summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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-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-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-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-21grep: stop leaking line strings with -fRené Scharfe1-5/+2
2012-05-20remote: fix typoRalf Thielow1-1/+1
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-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-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
2012-05-11document submdule.$name.update=none option for gitmodulesHeiko Voigt2-6/+6
2012-05-10The tenth batch of topicsJunio C Hamano1-14/+24
2012-05-10Merge branch 'rs/dir-strbuf'Junio C Hamano1-39/+37
2012-05-10Merge branch 'nd/i18n-apply-lego'Junio C Hamano1-4/+11
2012-05-10Merge branch 'jk/status-porcelain-z-b'Junio C Hamano5-95/+110
2012-05-10Merge branch 'fa/maint-config-doc'Junio C Hamano1-5/+9
2012-05-10Merge branch 'ef/maint-clone-progress-fix'Junio C Hamano1-1/+1
2012-05-10Merge branch 'ah/maint-grep-double-init'Junio C Hamano1-1/+1
2012-05-10Merge branch 'js/checkout-detach-count'Junio C Hamano2-11/+23
2012-05-10Merge branch 'jc/install-no-hardlinks'Junio C Hamano1-1/+11
2012-05-10Merge branch 'nd/stream-to-archive'Junio C Hamano8-135/+404
2012-05-10Merge branch 'mh/ref-api-lazy-loose'Junio C Hamano2-137/+247
2012-05-10Merge branch 'maint'Junio C Hamano1-0/+25
2012-05-10Update draft release notes to 1.7.10.2Junio C Hamano1-0/+25
2012-05-10Merge branch 'mm/include-userpath' into maintJunio C Hamano3-1/+18
2012-05-10Merge branch 'cc/fix-missing-va-end-in-revert' into maintJunio C Hamano1-0/+1
2012-05-10Merge branch 'bw/test-fix-grep-gnuism' into maintJunio C Hamano1-2/+2
2012-05-10Merge branch 'jk/http-backend-keep-committer-ident-env' into maintJunio C Hamano3-13/+37
2012-05-10Merge branch 'nl/rebase-i-cheat-sheet' into maintJunio C Hamano1-0/+2
2012-05-10Merge branch 'bw/submodule-sed-solaris' into maintJunio C Hamano1-2/+3
2012-05-10Merge branch 'jk/maint-push-progress' into maintJunio C Hamano3-2/+39
2012-05-10Merge branch 'jc/rerere-train' into maintJunio C Hamano1-1/+1
2012-05-10Merge branch 'lp/diffstat-with-graph' into maintJunio C Hamano5-6/+131
2012-05-09xdiff: remove unused functionsRené Scharfe2-46/+0
2012-05-09xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe4-54/+1
2012-05-09blame: factor out helper for calling xdi_diff()René Scharfe1-22/+16
2012-05-09blame: use hunk_func(), part 2René Scharfe1-5/+13
2012-05-09blame: use hunk_func(), part 1René Scharfe1-5/+12
2012-05-09xdiff: add hunk_func()René Scharfe2-0/+22
2012-05-09Merge branch 'maint' into masterRalf Thielow2-235/+255
2012-05-08i18n: apply: mark parseopt strings for translationNguyễn Thái Ngọc Duy1-31/+31
2012-05-08i18n: parseopt: lookup help and argument translations when showing usageNguyễn Thái Ngọc Duy2-19/+25
2012-05-08checkout: do not corrupt HEAD on empty repoErik Faye-Lund2-1/+12
2012-05-08apply: remove lego in i18n string in gitdiff_verify_nameNguyễn Thái Ngọc Duy1-4/+11
2012-05-08l10n: de.po: translate one new messageRalf Thielow1-130/+148
2012-05-08l10n: de.po: unify translation of "ahead" and "behind"Ralf Thielow1-8/+9
2012-05-08l10n: de.po: collection of improvementsRalf Thielow1-125/+129
2012-05-08l10n: de.po: translate "remote" as "extern"Ralf Thielow1-23/+23
2012-05-08l10n: de.po: translate "track" as "beobachten"Ralf Thielow1-12/+12
2012-05-08l10n: add new members to German translation teamRalf Thielow1-0/+3
2012-05-08l10n: de.po: collection of suggestionsThomas Rast1-55/+44
2012-05-08l10n: de.po: translate "bad" as "ungültig" ("invalid")Thomas Rast1-13/+13
2012-05-08l10n: de.po: hopefully uncontroversial fixesThomas Rast1-11/+11
2012-05-08l10n: de.po: translate "bare" as "bloß"Thomas Rast1-2/+2
2012-05-08Merge branch 'rs/maint-dir-strbuf' into rs/dir-strbufJunio C Hamano1-39/+37
2012-05-08dir: convert to strbufRené Scharfe1-39/+36
2012-05-08status: refactor colopts handlingJeff King2-6/+5
2012-05-08Merge branch 'jk/maint-status-porcelain-z-b' into HEADJeff King5-89/+105
2012-05-08status: respect "-b" for porcelain formatJeff King5-11/+16
2012-05-08status: fix null termination with "-b"Jeff King2-3/+13
2012-05-08status: refactor null_termination optionJeff King3-24/+24
2012-05-08commit: refactor option parsingJeff King1-58/+59
2012-05-08l10n: Update git.pot (275 new, 15 removed messages)Jiang Xin1-293/+1588
2012-05-08Merge branch 'maint'Jiang Xin0-0/+0
2012-05-08l10n: Update git.pot (1 new messages)Jiang Xin1-94/+98
2012-05-07index-pack: disable threading if NO_PREAD is definedNguyễn Thái Ngọc Duy1-0/+5
2012-05-07index-pack: support multithreaded delta resolvingNguyễn Thái Ngọc Duy4-12/+244
2012-05-07index-pack: restructure pack processing into three main functionsNguyễn Thái Ngọc Duy1-53/+75
2012-05-07Documentation/git-config: describe and clarify "--local <file>" optionFlorian Achleitner1-5/+9
2012-05-07reflog-walk: tell explicit --date=default from not having --date at allJunio C Hamano5-17/+15
2012-05-07The ninth batch of topics graduated to 'master'Junio C Hamano1-50/+19
2012-05-07Merge branch 'nh/empty-rebase'Junio C Hamano1-3/+11
2012-05-07Merge branch 'zj/diff-empty-chmod'Junio C Hamano2-34/+74
2012-05-07Merge branch 'jk/maint-tformat-with-z'Junio C Hamano2-1/+29
2012-05-07Merge branch 'th/difftool-diffall'Junio C Hamano4-87/+398
2012-05-07Sync with maintJunio C Hamano2-2/+49
2012-05-07Start preparing for 1.7.10.2Junio C Hamano2-1/+47
2012-05-07Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maintJunio C Hamano3-3/+3
2012-05-07Merge branch 'js/daemon-test-race-fix' into maintJunio C Hamano1-11/+11
2012-05-07Merge branch 'jk/maint-config-bogus-section' into maintJunio C Hamano2-1/+31
2012-05-07Merge branch 'pw/t5800-import-race-fix' into maintJunio C Hamano2-0/+20
2012-05-07Merge branch 'rt/cherry-revert-conflict-summary' into maintJunio C Hamano1-1/+1
2012-05-07Merge branch 'cb/maint-report-mount-point-correctly-in-setup' into maintJunio C Hamano1-9/+13
2012-05-07Merge branch 'ef/maint-1.7.6-clone-progress-fix' into ef/maint-clone-progress...Junio C Hamano1-1/+1
2012-05-07clone: fix progress-regressionErik Faye-Lund1-1/+1
2012-05-07grep.c: remove redundant line of codeAngus Hammond1-1/+1
2012-05-07git p4 doc: fix formattingPete Wyckoff1-1/+3
2012-05-07completion: simplify __git_complete_revlist_fileFelipe Contreras1-4/+2
2012-05-04checkout (detached): truncate list of orphaned commits at the new HEADJohannes Sixt2-7/+8
2012-05-04t2020-checkout-detach: check for the number of orphaned commitsJohannes Sixt1-5/+16
2012-05-04Makefile: NO_INSTALL_HARDLINKSJunio C Hamano1-1/+11
2012-05-04reflog-walk: always make HEAD@{0} show indexed selectorsJeff King2-1/+10
2012-05-04reflog-walk: clean up "flag" field of commit_reflog structJeff King1-3/+12
2012-05-04log: respect date_mode_explicit with --format:%gdJeff King5-2/+7
2012-05-04t1411: add more selector index/date testsJeff King1-0/+45
2012-05-04Makefile: keep many variable list sortedNguyễn Thái Ngọc Duy1-13/+13
2012-05-04refs: fix find_containing_dir() regressionJunio C Hamano1-1/+3
2012-05-04branch: remove lego in i18n tracking info stringsNguyễn Thái Ngọc Duy1-9/+23
2012-05-03git cherry-pick: do not dereference a potential NULL pointerNeil Horman1-3/+11
2012-05-03Merge branch 'maint'Junio C Hamano0-0/+0
2012-05-03Merge branch 'jc/merge-reduce-parents-early' into maintJunio C Hamano5-71/+276