summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-08-19Git 1.7.12v1.7.12Junio C Hamano2-1/+6
2012-08-17Merge branch 'jc/doc-git-updates' (early part)Junio C Hamano1-1/+1
2012-08-17Documentation: update URL for formatted pagesJunio C Hamano1-1/+1
2012-08-16Merge git://github.com/git-l10n/git-po to update Swedish translationJunio C Hamano1-6/+6
2012-08-16l10n: Fixes to Swedish translationPeter Krefting1-6/+6
2012-08-15Git 1.7.12-rc3v1.7.12-rc3Junio C Hamano2-11/+2
2012-08-15Sync with 1.7.11.5Junio C Hamano2-1/+10
2012-08-15Git 1.7.11.5v1.7.11.5Junio C Hamano3-2/+11
2012-08-15Merge branch 'rj/maint-grep-remove-redundant-test' into maintJunio C Hamano1-11/+0
2012-08-15Merge branch 'hv/link-alt-odb-entry' into maintJunio C Hamano1-1/+1
2012-08-10git svn: reset invalidates the memoized mergeinfo cachesPeter Baumann2-2/+103
2012-08-10git svn: handle errors and concurrent commits in dcommitRobert Luberda2-19/+271
2012-08-09Merge git://github.com/git-l10n/git-poJunio C Hamano5-580/+1375
2012-08-09l10n: Update Swedish translation (1168t0f0u)Peter Krefting1-510/+903
2012-08-08Merge branch 'bw/maint-1.7.9-solaris-getpass'Junio C Hamano2-0/+2
2012-08-08Documentation: list git-credential in plumbing commandsMatthieu Moy2-1/+2
2012-08-08Merge git://github.com/ralfth/git-po-deJiang Xin1-46/+442
2012-08-07Git 1.7.12-rc2v1.7.12-rc2Junio C Hamano2-5/+1
2012-08-07l10n: de.po: translate 77 new messagesRalf Thielow1-46/+442
2012-08-06Enable HAVE_DEV_TTY for SolarisBen Walton1-0/+1
2012-08-06terminal: seek when switching between reading and writingJeff King1-0/+1
2012-08-07l10n: vi.po: update one messageTran Ngoc Quan1-9/+11
2012-08-06Drop 1.7.11.x items from 1.7.12 release notesJunio C Hamano1-13/+0
2012-08-06Sync with maintJunio C Hamano1-0/+28
2012-08-06Prepare for 1.7.11.5Junio C Hamano2-1/+29
2012-08-06Merge branch 'jn/block-sha1' into maintJunio C Hamano2-7/+6
2012-08-06Merge branch 'jn/make-assembly-in-right-directory' into maintJunio C Hamano1-1/+1
2012-08-06Merge branch 'ms/daemon-doc-typo' into maintJunio C Hamano1-1/+1
2012-08-06Merge branch 'lm/git-blame-el' into maintJunio C Hamano1-36/+37
2012-08-06Merge branch 'rs/ipv6-ssh-url' into maintJunio C Hamano1-1/+1
2012-08-06Merge branch 'rs/git-blame-mapcar-mapc' into maintJunio C Hamano1-1/+1
2012-08-06Merge branch 'rr/doc-commit' into maintJunio C Hamano1-0/+8
2012-08-06doc: A few minor copy edits.Štěpán Němec5-10/+10
2012-08-06Merge branch 'jk/maint-checkout-orphan-check-fix' into maintJunio C Hamano1-1/+1
2012-08-06Merge branch 'mh/maint-revisions-doc' into maintJunio C Hamano1-6/+37
2012-08-06Merge branch 'jc/mergetool-tool-help' into maintJunio C Hamano3-5/+49
2012-08-06Makefile: use overridable $(FIND) instead of hard-coded 'find'Johannes Sixt1-1/+1
2012-08-07l10n: zh_CN.po: update one translationJiang Xin1-8/+10
2012-08-06l10n: Update one message in git.potJiang Xin1-7/+9
2012-08-05Merge git://github.com/git-l10n/git-poJunio C Hamano3-449/+1265
2012-08-05merge-recursive: separate message for common ancestorsRalf Thielow1-1/+4
2012-08-05l10n: zh_CN.po: translate 76 new messagesJiang Xin1-366/+451
2012-08-03git-remote-mediawiki: replace TODO-list in comment by appropriate linkMatthieu Moy1-14/+1
2012-08-03l10n: vi.po update to follow POT in 3b613Tran Ngoc Quan1-44/+420
2012-08-02l10n: Update git.pot (76 new, 4 removed messages)Jiang Xin1-39/+394
2012-08-01Merge git://github.com/git-l10n/git-poJunio C Hamano4-1981/+2305
2012-08-01git-rebase.sh: fix typo in an error messageRalf Thielow1-1/+1
2012-07-31Merge branch 'nd/maint-i18n-diffstat'Junio C Hamano1-1/+1
2012-07-31Merge branch 'jx/i18n-1.7.11'Junio C Hamano11-157/+150
2012-07-31l10n: de.po: translate 4 new messagesRalf Thielow1-494/+506
2012-07-31l10n: vi.po: translate 4 new messagesTran Ngoc Quan1-529/+545
2012-07-31l10n: zh_CN.po: translate 4 new messagesJiang Xin1-483/+776
2012-07-30Git 1.7.12-rc1v1.7.12-rc1Junio C Hamano2-33/+11
2012-07-30Sync with 1.7.11.4Junio C Hamano2-1/+33
2012-07-30Git 1.7.11.4v1.7.11.4Junio C Hamano4-3/+35
2012-07-30Merge branch 'jk/maint-commit-document-editmsg' into maintJunio C Hamano1-0/+9
2012-07-30Merge branch 'jk/maint-advise-vaddf' into maintJunio C Hamano1-1/+1
2012-07-30Merge branch 'kk/maint-commit-tree' into maintJunio C Hamano3-4/+18
2012-07-30Merge branch 'jv/maint-no-ext-diff' into maintJunio C Hamano2-3/+64
2012-07-30Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maintJunio C Hamano2-0/+8
2012-07-30Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maintJunio C Hamano2-2/+17
2012-07-30Merge branch 'jc/maint-filter-branch-epoch-date' into maintJunio C Hamano4-5/+15
2012-07-30Merge branch 'rj/maint-grep-remove-redundant-test'Junio C Hamano1-11/+0
2012-07-30Merge branch 'dg/submodule-in-dismembered-working-tree'Junio C Hamano1-6/+23
2012-07-30t7409: make sure submodule is initialized and updated in more detailDaniel Graña1-6/+23
2012-07-30Merge branch 'hv/link-alt-odb-entry'Junio C Hamano1-1/+1
2012-07-30Add explanatory comment for transport-helpers refs mapping.Florian Achleitner1-0/+15
2012-07-30l10n: Update git.pot (4 new, 3 removed messages)Jiang Xin1-475/+478
2012-07-29t7810-*.sh: Remove redundant testRamsay Jones1-11/+0
2012-07-29t1100-*.sh: Fix an intermittent test failureRamsay Jones1-0/+1
2012-07-29link_alt_odb_entry: fix read over array bounds reported by valgrindHeiko Voigt1-1/+1
2012-07-29t: add missing executable bit to t7409Jeff King1-0/+0
2012-07-27Update draft release notes to 1.7.12Junio C Hamano1-0/+15
2012-07-27Merge branch 'extract-remaining' of git://git.bogomips.org/git-svnJunio C Hamano9-761/+795
2012-07-27Merge git://git.bogomips.org/git-svnJunio C Hamano10-2338/+2487
2012-07-27Merge branch 'jk/autoident-test'Junio C Hamano1-33/+42
2012-07-27Merge branch 'jk/help-plug-memleak'Junio C Hamano1-5/+9
2012-07-27Merge branch 'dg/submodule-in-dismembered-working-tree'Junio C Hamano2-2/+66
2012-07-27Merge branch 'jk/maint-checkout-orphan-check-fix'Junio C Hamano1-1/+1
2012-07-27Extract Git::SVN::GlobSpec from git-svn.Michael G. Schwern5-60/+64
2012-07-27Move Git::IndexInfo into its own file.Michael G. Schwern5-33/+37
2012-07-27Load all the modules in one place and before running code.Michael G. Schwern1-23/+21
2012-07-27Extract Git::SVN::Migration from git-svn.Michael G. Schwern4-258/+262
2012-07-27Prepare Git::SVN::Migration for extraction from git-svn.Michael G. Schwern1-12/+24
2012-07-27Extract Git::SVN::Log from git-svn.Michael G. Schwern4-396/+401
2012-07-27Prepare Git::SVN::Log for extraction from git-svn.Michael G. Schwern1-4/+11
2012-07-27Move initialization of Git::SVN variables into Git::SVN.Michael G. Schwern3-7/+9
2012-07-27Extract Git::SVN from git-svn into its own .pm file.Michael G. Schwern3-2319/+2321
2012-07-27Prepare Git::SVN for extraction into its own file.Michael G. Schwern1-4/+18
2012-07-27Extract some utilities from git-svn to allow extracting Git::SVN.Michael G. Schwern6-15/+132
2012-07-27perl: detect new files in MakeMaker buildsJunio C Hamano3-0/+11
2012-07-27The Makefile.PL will now find .pm files itself.Michael G. Schwern1-13/+16
2012-07-27Don't lose Error.pm if $@ gets clobbered.Michael G. Schwern1-2/+1
2012-07-27Quiet warning if Makefile.PL is run with -w and no --localedirMichael G. Schwern1-1/+2
2012-07-26i18n: merge-recursive: mark strings for translationJiang Xin3-78/+88
2012-07-26Remove dead code which contains bad gettext blockJiang Xin1-3/+0
2012-07-26i18n: am: mark more strings for translationJiang Xin1-6/+5
2012-07-26rebase: remove obsolete and unused LONG_USAGE which breaks xgettextJiang Xin1-25/+0
2012-07-26i18n: Rewrite gettext messages start with dashJiang Xin3-3/+3
2012-07-26t7502: test early quit from commit with bad identJeff King1-0/+17
2012-07-26t7502: handle systems where auto-identity is brokenJeff King1-3/+10
2012-07-26t7502: drop confusing test_might_fail callJeff King1-1/+1
2012-07-26t7502: narrow checks for author/committer name in templateJeff King1-17/+8
2012-07-26t7502: properly quote GIT_EDITORJeff King1-1/+1
2012-07-26t7502: clean up fake_editor testsJeff King1-13/+7
2012-07-26i18n: leave \n out of translated diffstatNguyễn Thái Ngọc Duy1-1/+1
2012-07-25Merge branch 'jc/test-lib-source-build-options-early'Junio C Hamano1-23/+22
2012-07-25Merge branch 'mm/config-xdg'Junio C Hamano4-6/+48
2012-07-25Merge branch 'cw/rebase-i-root'Junio C Hamano2-12/+21
2012-07-25Merge branch 'mh/maint-revisions-doc'Junio C Hamano1-6/+37
2012-07-25checkout: don't confuse ref and object flagsJeff King1-1/+1
2012-07-25git-submodule: work with GIT_DIR/GIT_WORK_TREEDaniel Graña2-2/+66
2012-07-25help.c::exclude_cmds(): plug a leakJunio C Hamano1-3/+4
2012-07-25help.c::uniq: plug a leakJeff King1-2/+5
2012-07-25i18n: rebase: mark messages for translationJiang Xin5-42/+53
2012-07-25i18n: New keywords for xgettext extraction from shJiang Xin1-1/+2
2012-07-24Enumerate revision range specifiers in the documentationJunio C Hamano1-0/+31
2012-07-24Update draft release notes to 1.7.12Junio C Hamano1-2/+19
2012-07-24Merge branch 'jc/mergetool-tool-help'Junio C Hamano3-5/+49
2012-07-24Merge branch 'jk/maint-commit-document-editmsg'Junio C Hamano1-0/+9
2012-07-24Merge branch 'jk/maint-commit-check-committer-early'Junio C Hamano1-1/+1
2012-07-24Merge branch 'jk/maint-advise-vaddf'Junio C Hamano1-1/+1
2012-07-24t/lib-httpd: handle running under --valgrindJeff King2-1/+8
2012-07-24rebase -i: handle fixup of root commit correctlyChris Webb2-12/+21
2012-07-24t1306: check that XDG_CONFIG_HOME worksJeff King1-0/+26
2012-07-24ignore: make sure we have an xdg path before using itMatthieu Moy2-1/+8
2012-07-24attr: make sure we have an xdg path before using itJeff King2-5/+13
2012-07-24test-lib.sh: unset XDG_CONFIG_HOMEJeff King1-0/+1
2012-07-23Git 1.7.12-rc0v1.7.12-rc0Junio C Hamano2-1/+13
2012-07-23Merge branch 'jn/block-sha1'Junio C Hamano2-7/+6
2012-07-23Merge branch 'jn/make-assembly-in-right-directory'Junio C Hamano1-1/+1
2012-07-23Merge branch 'th/difftool-diffall'Junio C Hamano1-2/+5
2012-07-23Merge branch 'sl/autoconf'Junio C Hamano2-27/+46
2012-07-23Merge branch 'jv/maint-no-ext-diff'Junio C Hamano2-3/+64
2012-07-23Merge branch 'kk/maint-commit-tree'Junio C Hamano3-4/+18
2012-07-23Merge branch 'jk/mediawiki-credential'Junio C Hamano3-34/+22
2012-07-23Merge branch 'mm/mediawiki-usability'Junio C Hamano3-32/+116
2012-07-23Merge branch 'sn/doc-typofix'Junio C Hamano5-10/+10
2012-07-23Merge branch 'tg/ce-namelen-field'Junio C Hamano8-52/+65
2012-07-23Merge branch 'nk/maint-gitweb-log-by-lines'Junio C Hamano1-15/+18
2012-07-23commit: document the temporary commit message fileJeff King1-0/+9
2012-07-23mergetool: support --tool-help option like difftool doesJunio C Hamano3-5/+49
2012-07-23commit: check committer identity more strictlyJeff King1-1/+1
2012-07-23advice: pass varargs to strbuf_vaddf, not strbuf_addfJeff King1-1/+1
2012-07-23Makefile: BLK_SHA1 does not require fast htonl() and unaligned loadsJonathan Nieder1-3/+2
2012-07-22Makefile: fix location of listing produced by "make subdir/foo.s"Jonathan Nieder1-1/+1
2012-07-22block-sha1: put expanded macro parameters in parenthesesJonathan Nieder1-2/+2
2012-07-22block-sha1: avoid pointer conversion that violates alignment constraintsJonathan Nieder1-3/+3
2012-07-22Update draft release notes to 1.7.12Junio C Hamano1-56/+24
2012-07-22Sync with 1.7.11.3Junio C Hamano2-1/+55
2012-07-22Git 1.7.11.3v1.7.11.3Junio C Hamano4-3/+57
2012-07-22Merge branch 'jk/push-delete-ref-error-message' into maintJunio C Hamano1-0/+3
2012-07-22Merge branch 'ar/clone-honor-umask-at-top' into maintJunio C Hamano3-3/+3
2012-07-22Merge branch 'cw/amend-commit-without-message' into maintJunio C Hamano2-1/+16
2012-07-22Merge branch 'jk/maint-commit-amend-only-no-paths' into maintJunio C Hamano2-1/+14
2012-07-22Merge branch 'tg/maint-cache-name-compare' into maintJunio C Hamano2-4/+48
2012-07-22Merge branch 'tr/maint-show-walk' into maintJunio C Hamano2-0/+94
2012-07-22Merge branch 'jc/refactor-diff-stdin' into maintJunio C Hamano4-50/+67
2012-07-22Merge branch 'mz/empty-rebase-test' into maintJunio C Hamano1-0/+8
2012-07-22Merge branch 'js/fast-export-paths-with-spaces' into maintJunio C Hamano2-1/+3
2012-07-22Merge branch 'cw/no-detaching-an-unborn' into maintJunio C Hamano2-0/+8
2012-07-22Merge branch 'vr/use-our-perl-in-tests' into maintJunio C Hamano26-44/+65
2012-07-22Merge git://bogomips.org/git-svnJunio C Hamano1-5/+4
2012-07-22Merge branch 'jk/revision-walk-stop-at-max-count'Junio C Hamano1-20/+19
2012-07-22Merge branch 'mm/config-xdg'Junio C Hamano2-6/+14
2012-07-22Merge branch 'as/t4012-style-updates'Junio C Hamano1-50/+44
2012-07-22Merge branch 'pg/maint-1.7.9-am-where-is-patch'Junio C Hamano2-0/+8
2012-07-22Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink'Junio C Hamano2-2/+17
2012-07-22Merge branch 'ms/daemon-doc-typo'Junio C Hamano1-1/+1
2012-07-22Merge branch 'lk/more-helpful-status-hints'Junio C Hamano2-3/+1
2012-07-22Merge branch 'jc/sha1-name-more'Junio C Hamano15-172/+714
2012-07-22Merge branch 'jc/maint-filter-branch-epoch-date'Junio C Hamano4-5/+15
2012-07-19difftool: only copy back files modified during directory diffTim Henigan1-2/+5
2012-07-19build: reconfigure automatically if configure.ac changesStefano Lattarini2-0/+14
2012-07-19build: "make clean" should not remove configure-generated filesStefano Lattarini1-2/+3
2012-07-19autoconf: use AC_CONFIG_COMMANDS instead of ad-hoc 'config.mak.append'Stefano Lattarini1-11/+17
2012-07-19autoconf: remove few redundant semicolonsStefano Lattarini1-2/+2
2012-07-19autoconf: remove some redundant shell indirectionsStefano Lattarini1-7/+5
2012-07-19autoconf: GIT_CONF_APPEND_LINE -> GIT_CONF_SUBSTStefano Lattarini1-12/+12
2012-07-19autoconf: GIT_CONF_APPEND_LINE: change signatureStefano Lattarini1-14/+14
2012-07-19diff: test precedence of external diff driversJeff King1-0/+40
2012-07-19git-svn: don't create master if another head existsMarcin Owsiany1-5/+4
2012-07-18mw-to-git: use git-credential's URL parserJeff King1-28/+4
2012-07-18credential: convert "url" attribute into its parsed subpartsJeff King2-0/+14
2012-07-18mw-to-git: check blank credential attributes via lengthJeff King1-1/+1
2012-07-18docs/credential: minor clarity fixupsJeff King1-6/+4
2012-07-17diff: correctly disable external_diff with --no-ext-diffJunio C Hamano2-3/+24
2012-07-17Revert "git-commit-tree(1): update synopsis"Junio C Hamano1-1/+1
2012-07-17Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-treeJunio C Hamano2-3/+17
2012-07-17commit-tree: resurrect command line parsing updatesJunio C Hamano2-3/+17
2012-07-17git-remote-mediawiki: allow page names with a ':'Matthieu Moy2-16/+53
2012-07-17git-remote-mediawiki: fix incorrect test usage in testMatthieu Moy1-1/+1
2012-07-16t4012: Use test_must_fail instead of if-elseAlexander Strasser1-14/+2
2012-07-16t4012: use 'printf' instead of 'dd' to generate a binary fileJohannes Sixt1-1/+1
2012-07-16t4012: Re-indent test snippetsAlexander Strasser1-34/+34
2012-07-16t4012: Make --shortstat test more robustAlexander Strasser1-2/+2
2012-07-16t4012: Break up pipe into serial redirectionsAlexander Strasser1-1/+2
2012-07-16t4012: Actually quote the sed scriptAlexander Strasser1-2/+2
2012-07-16git-remote-mediawiki: properly deal with invalid remote revisionsMatthieu Moy1-4/+9
2012-07-16git-remote-mediawiki: show progress information when getting last remote revi...Matthieu Moy1-0/+2