summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-07-21Git 2.5.0-rc3v2.5.0-rc3Junio C Hamano1-1/+1
2015-07-21Merge branch 'tf/gitweb-typofix'Junio C Hamano1-1/+1
2015-07-21Merge tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano9-2680/+3179
2015-07-20l10n: ca.po: update translationAlex Henrie1-187/+204
2015-07-17Merge branch 'jk/still-interesting'Junio C Hamano1-2/+2
2015-07-17Merge branch 'es/worktree-add'Junio C Hamano2-5/+6
2015-07-17Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" referenceEric Sunshine1-1/+1
2015-07-16worktree: caution that this is still experimentalJunio C Hamano1-2/+3
2015-07-16Documentation/git-worktree: fix stale "git checkout --to" referencesEric Sunshine1-2/+2
2015-07-16Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin1-199/+241
2015-07-15Sync with 2.4.6Junio C Hamano2-1/+25
2015-07-15Git 2.4.6v2.4.6Junio C Hamano4-3/+27
2015-07-15Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano1-1/+6
2015-07-15Merge branch 'mm/describe-doc' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'jc/prompt-document-ps1-state-separator' into maintJunio C Hamano1-0/+4
2015-07-15Merge branch 'es/osx-header-pollutes-mask-macro' into maintJunio C Hamano4-29/+29
2015-07-15Merge branch 'es/utf8-stupid-compiler-workaround' into maintJunio C Hamano1-1/+3
2015-07-15Merge branch 'fk/doc-format-patch-vn' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'pt/t0302-needs-sanity' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'me/fetch-into-shallow-safety' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'mh/fsck-reflog-entries' into maintJunio C Hamano1-14/+20
2015-07-15Merge branch 'af/tcsh-completion-noclobber' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'pa/auto-gc-mac-osx' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2-6/+14
2015-07-15l10n: de.po: translate 9 new messagesRalf Thielow1-199/+241
2015-07-15l10n: Updated Bulgarian translation of git (2359t,0f,0u)Alexander Shopov1-190/+208
2015-07-15l10n: zh_CN: for git v2.5.0 l10n round 2Jiang Xin1-199/+201
2015-07-15l10n: sv.po: Update Swedish translation (2359t0f0u)Peter Krefting1-186/+216
2015-07-15Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/gitJiang Xin1-199/+252
2015-07-14l10n: fr v2.5.0 round 2 (2359t)Jean-Noel Avila1-199/+252
2015-07-14Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin1-1120/+1411
2015-07-14l10n: ru.po: update Russian translationDimitriy Ryazantcev1-1120/+1411
2015-07-14l10n: Updated Vietnamese translation (2359t)Tran Ngoc Quan1-218/+247
2015-07-14l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)Jiang Xin1-182/+199
2015-07-13Merge tag 'l10n-2.5.0-rnd1' of git://github.com/git-l10n/git-poJunio C Hamano8-9106/+11110
2015-07-13Git 2.5.0-rc2v2.5.0-rc2Junio C Hamano2-3/+45
2015-07-13Merge branch 'es/worktree-add'Junio C Hamano8-260/+386
2015-07-13Merge branch 'nd/multiple-work-trees'Junio C Hamano13-126/+217
2015-07-13Merge branch 'ss/clone-guess-dir-name-simplify'Junio C Hamano1-13/+6
2015-07-13Merge branch 'kb/config-unmap-before-renaming'Junio C Hamano1-0/+3
2015-07-13Merge branch 'mh/strbuf-read-file-returns-ssize-t'Junio C Hamano2-3/+4
2015-07-13Merge branch 'jc/unexport-git-pager-in-use-in-pager'Junio C Hamano1-0/+1
2015-07-13Merge branch 'kb/use-nsec-doc'Junio C Hamano2-6/+11
2015-07-13Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Junio C Hamano2-1/+26
2015-07-13Merge branch 'et/http-proxyauth'Junio C Hamano1-2/+2
2015-07-13Merge branch 'jc/fsck-retire-require-eoh'Junio C Hamano1-4/+13
2015-07-12diff: parse ws-error-highlight option more strictlyRené Scharfe1-1/+6
2015-07-12Revert "checkout: retire --ignore-other-worktrees in favor of --force"Junio C Hamano3-7/+12
2015-07-10The last minute bits of fixesJunio C Hamano1-0/+21
2015-07-10Merge branch 'cb/rebase-am-exit-code'Junio C Hamano1-1/+1
2015-07-10Merge branch 'jk/fix-refresh-utime'Junio C Hamano1-1/+9
2015-07-10Merge branch 'mm/branch-doc-updates'Junio C Hamano1-2/+6
2015-07-10Merge branch 'ls/hint-rev-list-count'Junio C Hamano2-0/+2
2015-07-10Merge branch 'jk/rev-list-no-bitmap-while-pruning'Junio C Hamano2-1/+7
2015-07-10Merge branch 'cb/subtree-tests-update'Junio C Hamano1-152/+150
2015-07-10Merge branch 'rh/test-color-avoid-terminfo-in-original-home'Junio C Hamano1-52/+47
2015-07-10Merge branch 'sb/p5310-and-chain'Junio C Hamano1-3/+3
2015-07-10Merge branch 'tb/checkout-doc'Junio C Hamano1-1/+5
2015-07-10Merge branch 'jk/pretty-encoding-doc'Junio C Hamano1-1/+4
2015-07-10Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano1-0/+26
2015-07-09Merge branch 'jk/maint-for-each-packed-object'Junio C Hamano2-1/+7
2015-07-09Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'Junio C Hamano1-8/+8
2015-07-09clone: simplify string handling in guess_dir_name()Sebastian Schuberth1-13/+6
2015-07-08check_and_freshen_file: fix reversed success-checkJeff King1-1/+9
2015-07-08rebase: return non-zero error code if format-patch failsClemens Buchacher1-1/+1
2015-07-08l10n: de.po: translate 65 new messagesRalf Thielow1-1132/+1391
2015-07-08l10n: de.po: translate "index" as "Index"Ralf Thielow1-69/+65
2015-07-08l10n: de.po: fix translation of "head nodes"Ralf Thielow1-2/+2
2015-07-07checkout: retire --ignore-other-worktrees in favor of --forceEric Sunshine3-12/+7
2015-07-07worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine3-4/+26
2015-07-06worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine3-2/+10
2015-07-06worktree: extract basename computation to new functionEric Sunshine1-9/+20
2015-07-06checkout: require worktree unconditionallyEric Sunshine2-3/+1
2015-07-06checkout: retire --to optionEric Sunshine3-173/+139
2015-07-06tests: worktree: retrofit "checkout --to" tests for "worktree add"Eric Sunshine3-29/+25
2015-07-06worktree: add -b/-B optionsEric Sunshine2-3/+21
2015-07-06worktree: add --detach optionEric Sunshine2-2/+9
2015-07-06worktree: add --force optionEric Sunshine2-2/+12
2015-07-06worktree: introduce "add" commandEric Sunshine2-10/+41
2015-07-06checkout: drop 'checkout_opts' dependency from prepare_linked_checkoutEric Sunshine1-4/+5
2015-07-06checkout: make --to unconditionally verboseEric Sunshine1-2/+1
2015-07-06checkout: prepare_linked_checkout: drop now-unused 'new' argumentEric Sunshine1-3/+2
2015-07-06checkout: relocate --to's "no branch specified" checkEric Sunshine1-3/+4
2015-07-06checkout: fix bug with --to and relative HEADEric Sunshine2-4/+22
2015-07-06Documentation/git-worktree: add EXAMPLES sectionEric Sunshine1-0/+22
2015-07-06Documentation/git-worktree: add high-level 'lock' overviewEric Sunshine1-9/+15
2015-07-06Documentation/git-worktree: split technical info from general descriptionEric Sunshine1-34/+36
2015-07-06Documentation/git-worktree: add BUGS sectionEric Sunshine1-3/+16
2015-07-06Documentation: move linked worktree description from checkout to worktreeEric Sunshine2-67/+64
2015-07-06Documentation/git-worktree: associate options with commandsEric Sunshine1-3/+3
2015-07-06Documentation/git-checkout: fix incorrect worktree prune commandEric Sunshine1-1/+1
2015-07-06Documentation/branch: document -M and -D in terms of --forceMatthieu Moy1-2/+2
2015-07-06Documentation/branch: document -d --force and -m --forceMatthieu Moy1-0/+4
2015-07-06git-multimail: update to release 1.1.1Matthieu Moy4-6/+17
2015-07-05l10n: zh_CN: for git v2.5.0 l10n round 1Jiang Xin1-1122/+1381
2015-07-04index-pack: fix allocation of sorted_by_pos arrayJunio C Hamano1-8/+8
2015-07-03strbuf: strbuf_read_file() should return ssize_tMichael Haggerty2-3/+4
2015-07-03pager: do not leak "GIT_PAGER_IN_USE" to the pagerJunio C Hamano1-0/+1
2015-07-01l10n: ca.po: update translationAlex Henrie1-1127/+1382
2015-07-02Merge branch 'fr_2.5.0_round1' of git://github.com/jnavila/gitJiang Xin1-1131/+1379
2015-07-01Makefile / racy-git.txt: clarify USE_NSEC prerequisitesKarsten Blees2-6/+11
2015-07-01Git 2.5.0-rc1v2.5.0-rc1Junio C Hamano2-1/+8
2015-07-01Merge branch 'me/fetch-into-shallow-safety'Junio C Hamano1-1/+1
2015-07-01Merge branch 'jc/prompt-document-ps1-state-separator'Junio C Hamano1-0/+4
2015-07-01Merge branch 'mm/describe-doc'Junio C Hamano1-1/+1
2015-07-01Merge branch 'da/mergetool-winmerge'Junio C Hamano1-0/+1
2015-07-01rev-list: disable --use-bitmap-index when pruning commitsJeff King2-1/+7
2015-07-01Add tests for wildcard "path vs ref" disambiguationNguyễn Thái Ngọc Duy1-0/+26
2015-07-01rev-list: add --count to usage guideLawrence Siebert2-0/+2
2015-06-30l10n: fr.po v2.5.0-rc0 (2355t)Jean-Noel Avila1-1131/+1379
2015-06-30config.c: fix writing config files on Windows network sharesKarsten Blees1-0/+3
2015-06-29rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin2-2/+6
2015-06-29t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin1-0/+21
2015-06-29http: always use any proxy auth method availableEnrique Tobis1-2/+2
2015-06-29revision.c: remove unneeded check for NULLStefan Beller1-2/+2
2015-06-29worktree: new place for "git prune --worktrees"Nguyễn Thái Ngọc Duy11-114/+198
2015-06-29Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin1-1158/+1401
2015-06-28Sync with maintJunio C Hamano0-0/+0
2015-06-28fsck: it is OK for a tag and a commit to lack the bodyJunio C Hamano1-4/+13
2015-06-28l10n: Updated Bulgarian translation of git (2355t,0f,0u)Alexander Shopov1-1158/+1401
2015-06-28l10n: sv.po: Update Swedish translation (2355t0f0u)Peter Krefting1-1129/+1387
2015-06-28l10n: Updated Vietnamese translation (2355t)Tran Ngoc Quan1-1132/+1382
2015-06-27l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed)Jiang Xin1-1108/+1344
2015-06-26p5310: Fix broken && chain in performance testStefan Beller1-3/+3
2015-06-25Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2-9/+0
2015-06-25Merge branch 'cb/array-size' into maintJunio C Hamano1-5/+3
2015-06-25Git 2.5.0-rc0v2.5.0-rc0Junio C Hamano2-16/+3
2015-06-25Merge branch 'cn/cvsimport-perl-update'Junio C Hamano1-1/+1
2015-06-25Merge branch 'cb/array-size'Junio C Hamano1-5/+3
2015-06-25Sync with 2.4.5Junio C Hamano2-1/+30
2015-06-25Git 2.4.5v2.4.5Junio C Hamano4-3/+32
2015-06-25Merge branch 'sg/merge-summary-config' into maintJunio C Hamano3-16/+12
2015-06-25Merge branch 'jk/make-fix-dependencies' into maintJunio C Hamano1-24/+25
2015-06-25Merge branch 'sb/pack-protocol-mention-smart-http' into maintJunio C Hamano1-3/+3
2015-06-25Merge branch 'jk/die-on-bogus-worktree-late' into maintJunio C Hamano2-10/+26
2015-06-25Merge branch 'pt/pull-tags-error-diag' into maintJunio C Hamano1-9/+0
2015-06-25Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano5-22/+23
2015-06-25Merge branch 'jk/diagnose-config-mmap-failure' into maintJunio C Hamano4-11/+29
2015-06-25Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano7-9/+34
2015-06-25Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2-41/+58
2015-06-25Merge branch 'nd/diff-i-t-a'Junio C Hamano4-38/+8
2015-06-24cvsimport: silence regex warning appearing in Perl 5.22.Christian Neukirchen1-1/+1
2015-06-24Fix definition of ARRAY_SIZE for non-gcc buildsCharles Bailey1-5/+3
2015-06-24Ninth batch for 2.5Junio C Hamano1-39/+102
2015-06-24Merge branch 'jk/stash-require-clean-index'Junio C Hamano2-9/+0
2015-06-24Merge branch 'pa/auto-gc-mac-osx'Junio C Hamano1-1/+1
2015-06-24Merge branch 'pt/t0302-needs-sanity'Junio C Hamano1-1/+1
2015-06-24Merge branch 'ld/p4-changes-block-size'Junio C Hamano3-31/+165
2015-06-24Merge branch 'fk/doc-format-patch-vn'Junio C Hamano1-1/+1
2015-06-24Merge branch 'sg/commit-cleanup-scissors'Junio C Hamano2-5/+28
2015-06-24Merge branch 'jk/index-pack-reduce-recheck'Junio C Hamano3-3/+14
2015-06-24Merge branch 'af/tcsh-completion-noclobber'Junio C Hamano1-1/+1
2015-06-24Merge branch 'mh/reporting-broken-refs-from-for-each-ref'Junio C Hamano3-7/+83
2015-06-24Merge branch 'sg/completion-commit-cleanup'Junio C Hamano1-1/+1
2015-06-24Merge branch 'pt/am-abort-fix'Junio C Hamano2-8/+104
2015-06-24Merge branch 'nd/untracked-cache'Junio C Hamano1-1/+2
2015-06-24Merge branch 'mh/fsck-reflog-entries'Junio C Hamano1-14/+20
2015-06-24Merge branch 'js/sleep-without-select'Junio C Hamano4-23/+16
2015-06-24Merge branch 'es/utf8-stupid-compiler-workaround'Junio C Hamano1-1/+3
2015-06-24Merge branch 'rl/am-3way-config'Junio C Hamano4-17/+53
2015-06-24Merge branch 'jc/ll-merge-expose-path'Junio C Hamano3-8/+21
2015-06-24Merge branch 'es/osx-header-pollutes-mask-macro'Junio C Hamano4-29/+29
2015-06-24Merge branch 'es/configure-getdelim'Junio C Hamano2-0/+9
2015-06-24Merge branch 'pt/pull-optparse'Junio C Hamano4-43/+122
2015-06-24Merge branch 'qn/blame-show-email'Junio C Hamano3-1/+73
2015-06-24Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'Junio C Hamano2-6/+14
2015-06-24Merge branch 'es/send-email-sendmail-alias'Junio C Hamano3-46/+98
2015-06-24Merge branch 'jc/apply-reject-noop-hunk'Junio C Hamano2-0/+16
2015-06-23Revert "diff-lib.c: adjust position of i-t-a entries in diff"Junio C Hamano4-38/+8
2015-06-22contrib/subtree: small tidy-up to testCharles Bailey1-3/+1
2015-06-22contrib/subtree: fix broken &&-chains and revealed test errorCharles Bailey1-4/+4
2015-06-22contrib/subtree: use tabs consitently for indentation in testsCharles Bailey1-147/+147
2015-06-22for_each_packed_object: automatically open pack indexJeff King2-1/+7
2015-06-19mergetool-lib: fix default tool selectionMichael J Gruber1-0/+1
2015-06-18git-multimail: update to release 1.1.0Matthieu Moy6-326/+1017
2015-06-17test-lib.sh: fix color support when tput needs ~/.terminfoRichard Hansen1-29/+28
2015-06-17docs: clarify that --encoding can produce invalid sequencesJeff King1-1/+4
2015-06-17git-checkout.txt: document "git checkout <pathspec>" betterTorsten Bögershausen1-1/+5
2015-06-17Revert "test-lib.sh: do tests for color support after changing HOME"Richard Hansen1-47/+43
2015-06-17fetch-pack: check for shallow if depth givenMike Edgar1-1/+1
2015-06-16Eighth batch for 2.5Junio C Hamano1-1/+11
2015-06-16Sync with 2.4.4Junio C Hamano3-6/+42
2015-06-16Git 2.4.4v2.4.4Junio C Hamano4-3/+39
2015-06-16Merge branch 'jk/clone-dissociate' into maintJunio C Hamano1-13/+4
2015-06-16Merge branch 'sb/submodule-doc-intro' into maintJunio C Hamano1-28/+22
2015-06-16Merge branch 'sb/glossary-submodule' into maintJunio C Hamano1-0/+16
2015-06-16Merge branch 'ah/usage-strings' into maintJunio C Hamano2-2/+2
2015-06-16Merge branch 'mc/commit-doc-grammofix' into maintJunio C Hamano1-1/+1
2015-06-16Merge branch 'rs/janitorial' into maintJunio C Hamano7-26/+9
2015-06-16Merge branch 'sb/test-bitmap-free-at-end' into maintJunio C Hamano1-1/+1
2015-06-16Merge branch 'dt/clean-pathspec-filter-then-lstat' into maintJunio C Hamano1-3/+3
2015-06-16Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano3-29/+139
2015-06-16Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano2-1/+27
2015-06-16Merge branch 'jk/stash-options' into maintJunio C Hamano2-1/+20
2015-06-16Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano2-2/+14
2015-06-16Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maintJunio C Hamano1-1/+53
2015-06-16Merge branch 'nd/slim-index-pack-memory-usage'Junio C Hamano1-2/+6
2015-06-16Merge branch 'sb/pack-protocol-mention-smart-http'Junio C Hamano1-3/+3
2015-06-16Merge branch 'jk/make-fix-dependencies'Junio C Hamano1-24/+25
2015-06-16Merge branch 'jk/die-on-bogus-worktree-late'Junio C Hamano2-10/+26