summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-02-05Git 2.3v2.3.0Junio C Hamano3-1/+12
2015-02-02Merge git://github.com/git-l10n/git-poJunio C Hamano1-5/+5
2015-01-30l10n: ca.po: Fix trailing whitespaceAlex Henrie1-5/+5
2015-01-27Git 2.3.0-rc2v2.3.0-rc2Junio C Hamano1-1/+1
2015-01-27Merge git://github.com/git-l10n/git-poJunio C Hamano2-929/+941
2015-01-27Merge branch 'master' of git://github.com/alexhenrie/git-poJiang Xin1-925/+937
2015-01-26l10n: de.po: correct singular formMichael J Gruber1-1/+1
2015-01-26l10n: de.po: translate "leave behind" correctlyMichael J Gruber1-2/+2
2015-01-26l10n: de.po: fix typoBenedikt Heine1-2/+2
2015-01-26l10n: ca.po: update translationAlex Henrie1-925/+937
2015-01-22Merge branch 'js/t1050'Junio C Hamano1-6/+6
2015-01-22Merge branch 'ak/cat-file-clean-up'Junio C Hamano1-2/+0
2015-01-22Merge git://github.com/git-l10n/git-poJunio C Hamano7-6423/+6506
2015-01-22Merge branch 'sh/asciidoc-git-version-fix'Junio C Hamano1-1/+1
2015-01-22Documentation: fix version numberingSven van Haastregt1-1/+1
2015-01-22Merge branch 'jh/empty-notes'Junio C Hamano1-1/+1
2015-01-22Fix unclosed here document in t3301.shKacper Kornet1-1/+1
2015-01-21l10n: correct indentation of show-branch usageJiang Xin6-64/+62
2015-01-21Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin7-6430/+6515
2015-01-20Git 2.3.0-rc1v2.3.0-rc1Junio C Hamano2-1/+6
2015-01-20Merge branch 'jk/http-push-symref-fix'Junio C Hamano1-0/+3
2015-01-20Merge branch 'ak/show-branch-usage-string'Junio C Hamano1-3/+3
2015-01-20show-branch: fix indentation of usage stringRalf Thielow1-3/+3
2015-01-20Merge branch 'jk/colors'Junio C Hamano2-0/+5
2015-01-20parse_color: fix return value for numeric color values 0-8Jeff King2-0/+5
2015-01-20l10n: de.po: translate 3 messagesRalf Thielow1-141/+142
2015-01-19l10n: zh_CN: various fixes on command argumentsJiang Xin1-176/+175
2015-01-19Merge branch 'v2.3.0' of git://github.com/jnavila/gitJiang Xin1-133/+137
2015-01-19Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin1-131/+131
2015-01-19l10n: vi.po(2298t): Updated 3 new stringsTran Ngoc Quan1-137/+137
2015-01-18l10n: sv.po: Update Swedish translation (2298t0f0u)Peter Krefting1-131/+131
2015-01-18l10n: fr.po v2.3.0 round 2Jean-Noel Avila1-133/+137
2015-01-18l10n: git.pot: v2.3.0 round 2 (3 updated)Jiang Xin1-124/+124
2015-01-18Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin7-6003/+6084
2015-01-17l10n: de.po: translate 13 new messagesRalf Thielow1-836/+857
2015-01-17l10n: de.po: fix typoRalf Thielow1-1/+1
2015-01-17l10n: de.po: translate "track" as "versionieren"Ralf Thielow1-20/+20
2015-01-17l10n: zh_CN: translations for git v2.3.0-rc0Jiang Xin1-830/+853
2015-01-15git-svn: make it play nicely with submodulesRamkumar Ramachandra1-0/+6
2015-01-15Git::SVN: handle missing ref_id case correctlyRamkumar Ramachandra1-1/+1
2015-01-14l10n: sv.po: Update Swedish translation (2298t0f0u)Peter Krefting1-842/+865
2015-01-14t1050-large: generate large files without ddJohannes Sixt1-6/+6
2015-01-14Fifth batch for 2.3 cycleJunio C Hamano1-2/+27
2015-01-14Merge branch 'po/doc-core-ignorestat'Junio C Hamano1-8/+13
2015-01-14Merge branch 'rc/for-each-ref-tracking'Junio C Hamano2-2/+22
2015-01-14Merge branch 'rh/autoconf-rhel3'Junio C Hamano5-1/+56
2015-01-14Merge branch 'ak/fewer-includes'Junio C Hamano2-7/+0
2015-01-14Merge branch 'ak/doc-add-v-n-options'Junio C Hamano1-1/+1
2015-01-14Merge branch 'ak/show-branch-usage-string'Junio C Hamano1-1/+4
2015-01-14Merge branch 'rh/test-color-avoid-terminfo-in-original-home'Junio C Hamano1-44/+48
2015-01-14Merge branch 'tf/prompt-preserve-exit-status'Junio C Hamano1-5/+5
2015-01-14Merge branch 'rh/hide-prompt-in-ignored-directory'Junio C Hamano2-7/+123
2015-01-14Merge branch 'mm/complete-rebase-autostash'Junio C Hamano1-0/+1
2015-01-14Merge branch 'aw/doc-smtp-ssl-cert-path'Junio C Hamano1-4/+9
2015-01-14Merge branch 'sp/subtree-doc'Junio C Hamano1-105/+89
2015-01-14Merge branch 'km/log-usage-string-i18n'Junio C Hamano1-2/+2
2015-01-14Merge branch 'km/imap-send-libcurl-options'Junio C Hamano1-3/+3
2015-01-14Merge branch 'jk/prune-packed-server-info'Junio C Hamano2-1/+12
2015-01-14Merge branch 'js/remote-add-with-insteadof'Junio C Hamano2-1/+8
2015-01-14http-push: trim trailing newline from remote symrefJeff King1-0/+3
2015-01-14git-prompt: preserve value of $? in all casesTony Finch1-4/+4
2015-01-13cat-file: use "type" and "size" from outer scopeAlexander Kuleshov1-2/+0
2015-01-13l10n: fr.po v2.3.0 round 1Jean-Noel Avila1-833/+852
2015-01-13l10n: vi.po(2298t): Updated and change Plural-FormsTran Ngoc Quan1-1019/+986
2015-01-13l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)Jiang Xin1-824/+831
2015-01-13Merge branch 'master' of git://github.com/alexhenrie/git-poJiang Xin1-798/+819
2015-01-12doc: core.ignoreStat update, and clarify the --assume-unchanged effectPhilip Oakley1-9/+13
2015-01-12for-each-ref: always check stat_tracking_info()'s return valueRaphael Kubo da Costa2-2/+22
2015-01-12Git 2.3.0-rc0v2.3.0-rc0Junio C Hamano2-1/+18
2015-01-12Sync with 2.2.2Junio C Hamano2-1/+32
2015-01-12Git 2.2.2v2.2.2Junio C Hamano3-2/+33
2015-01-12Merge branch 'jk/read-packed-refs-without-path-max' into maintJunio C Hamano1-21/+25
2015-01-12Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano2-2/+8
2015-01-12Merge branch 'mh/find-uniq-abbrev' into maintJunio C Hamano1-1/+1
2015-01-12Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maintJunio C Hamano2-9/+15
2015-01-12Merge branch 'rw/apply-does-not-take-ignore-date' into maintJunio C Hamano1-1/+0
2015-01-12Merge branch 'jk/for-each-reflog-ent-reverse' into maintJunio C Hamano2-12/+67
2015-01-12Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository'Junio C Hamano9-7/+35
2015-01-12Merge branch 'sb/doc-submitting-patches-keep-notes'Junio C Hamano1-2/+5
2015-01-12Merge branch 'rs/simplify-transport-get'Junio C Hamano1-3/+1
2015-01-12Merge branch 'rs/simplify-parsing-commit-tree-S'Junio C Hamano1-3/+1
2015-01-12Merge branch 'rs/plug-strbuf-leak-in-merge'Junio C Hamano1-0/+1
2015-01-12Merge branch 'rs/plug-strbuf-leak-in-lock-ref'Junio C Hamano1-1/+1
2015-01-12Merge branch 'es/checkout-index-temp'Junio C Hamano2-203/+213
2015-01-12Merge branch 'cc/bisect-rev-parsing'Junio C Hamano2-4/+16
2015-01-09Documentation: list long options for -v and -nAlexander Kuleshov1-1/+1
2015-01-09cat-file: remove unused includesAlexander Kuleshov1-4/+0
2015-01-09git.c: remove unnecessary #includesAlexander Kuleshov1-3/+0
2015-01-09configure.ac: check for HMAC_CTX_cleanupReuben Hawkins3-0/+13
2015-01-09configure.ac: check for clock_gettime and CLOCK_MONOTONICReuben Hawkins4-1/+30
2015-01-09configure.ac: check 'tv_nsec' field in 'struct stat'Reuben Hawkins1-0/+13
2015-01-08show-branch: line-wrap show-branch usageAlexander Kuleshov1-1/+4
2015-01-07Fourth batch for 2.3 cycleJunio C Hamano1-0/+82
2015-01-07Merge branch 'maint'Junio C Hamano2-12/+35
2015-01-07Merge branch 'maint-2.1' into maintJunio C Hamano2-12/+35
2015-01-07Merge branch 'maint-2.0' into maint-2.1Junio C Hamano2-12/+35
2015-01-07Merge branch 'maint-1.9' into maint-2.0Junio C Hamano2-12/+35
2015-01-07Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2-12/+35
2015-01-07Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano2-12/+35
2015-01-07Merge branch 'bw/maint-0090-awk-tweak'Junio C Hamano1-1/+1
2015-01-07Merge branch 'jh/pre-push-sample-no-custom-ifs'Junio C Hamano1-1/+0
2015-01-07Merge branch 'tf/prompt-preserve-exit-status'Junio C Hamano1-0/+4
2015-01-07Merge branch 'sb/dco-indentation-fix'Junio C Hamano1-6/+6
2015-01-07Merge branch 'bb/update-unicode-table'Junio C Hamano1-7/+10
2015-01-07Merge branch 'es/squelch-openssl-warnings-on-macosx'Junio C Hamano1-0/+4
2015-01-07Merge branch 'sb/t5400-remove-unused'Junio C Hamano1-15/+1
2015-01-07Merge branch 'lh/send-email-hide-x-mailer'Junio C Hamano4-3/+47
2015-01-07Merge branch 'rd/send-email-2047-fix'Junio C Hamano2-11/+32
2015-01-07Merge branch 'pd/completion-filenames-fix'Junio C Hamano2-3/+3
2015-01-07Merge branch 'jk/add-i-read-error'Junio C Hamano1-0/+1
2015-01-07Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates'Junio C Hamano2-9/+15
2015-01-07Merge branch 'br/imap-send-via-libcurl'Junio C Hamano4-37/+191
2015-01-07Merge branch 'br/imap-send-verbosity'Junio C Hamano2-11/+31
2015-01-07Merge branch 'nd/lockfile-absolute'Junio C Hamano2-3/+26
2015-01-07Merge branch 'jc/merge-bases'Junio C Hamano11-22/+38
2015-01-07Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'Junio C Hamano2-1/+8
2015-01-07Merge branch 'jc/diff-b-m'Junio C Hamano3-3/+11
2015-01-07Merge branch 'jc/clone-borrow'Junio C Hamano3-2/+46
2015-01-07Merge branch 'jc/checkout-local-track-report'Junio C Hamano2-11/+41
2015-01-07git-completion: add --autostash for 'git rebase'Matthieu Moy1-0/+1
2015-01-07correct smtp-ssl-cert-path descriptionAdam Williamson1-4/+9
2015-01-07test-lib.sh: do tests for color support after changing HOMERichard Hansen1-43/+47
2015-01-07test-lib: use 'test ...' instead of '[ ... ]'Richard Hansen1-3/+3
2015-01-07git-prompt.sh: allow to hide prompt for ignored pwdJess Austin2-0/+119
2015-01-07git-prompt.sh: if pc mode, immediately set PS1 to a plain promptRichard Hansen1-7/+4
2015-01-07SubmittingPatches: explain rationale for using --notes with format-patchEric Sunshine1-2/+5
2015-01-06subtree: fix AsciiDoc list item continuationSteffen Prohaska1-105/+89
2015-01-06update-server-info: create info/* with mode 0666Jeff King2-1/+11
2015-01-06imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRYKyle J. McKay1-2/+2
2015-01-06imap-send.c: support GIT_CURL_VERBOSEKyle J. McKay1-1/+1
2015-01-06log.c: fix translation markingsKyle J. McKay1-2/+2
2015-01-06t1301: set umask in reflog sharedrepository=group testJeff King1-0/+1
2014-12-29refs: plug strbuf leak in lock_ref_sha1_basic()René Scharfe1-1/+1
2014-12-29is_hfs_dotgit: loosen over-eager match of \u{..47}Jeff King2-12/+35
2014-12-29bisect: add test to check that revs are properly parsedChristian Couder1-0/+9
2014-12-29bisect: parse revs before passing them to check_expected_revs()Christian Couder1-4/+7
2014-12-29checkout-index: fix --temp relative path manglingEric Sunshine2-9/+9
2014-12-29t2004: demonstrate broken relative path printingEric Sunshine1-0/+12
2014-12-29t2004: standardize file naming in symlink testEric Sunshine1-3/+3
2014-12-29t2004: drop unnecessary write-tree/read-treeEric Sunshine1-3/+0
2014-12-29t2004: modernize styleEric Sunshine1-195/+196
2014-12-29Merge branch 'for-junio' of git://bogomips.org/git-svnJunio C Hamano3-1/+181
2014-12-29pack-objects: use --objects-edge-aggressive for shallow reposbrian m. carlson5-4/+20
2014-12-29rev-list: add an option to mark fewer edges as uninterestingbrian m. carlson6-4/+16
2014-12-29transport: simplify duplicating a substring in transport_get() using xmemdupz()René Scharfe1-3/+1
2014-12-29merge: release strbuf after use in suggest_conflicts()René Scharfe1-0/+1
2014-12-29commit-tree: simplify parsing of option -S using skip_prefix()René Scharfe1-3/+1
2014-12-29Merge branch 'jc/t9001-modernise'Junio C Hamano1-294/+287
2014-12-29Merge branch 'mh/update-ref-verify'Junio C Hamano2-9/+97
2014-12-23l10n: ca.po: various fixesJoan Perals1-798/+819
2014-12-23Add a regression test for 'git remote add <existing> <same-url>'Johannes Schindelin1-0/+5
2014-12-23git remote: allow adding remotes agreeing with url.<...>.insteadOfJohannes Schindelin1-1/+3
2014-12-23t0090: tweak awk statement for Solaris /usr/xpg4/bin/awkBen Walton1-1/+1
2014-12-22Sync with maintJunio C Hamano2-1/+34
2014-12-22Third batch for 2.3 cycleJunio C Hamano1-2/+93
2014-12-22Merge branch 'rs/use-strbuf-complete-line'Junio C Hamano3-7/+3
2014-12-22Merge branch 'jg/prompt-localize-temporary'Junio C Hamano1-1/+1
2014-12-22Merge branch 'ch/new-gpg-drops-rfc-1991'Junio C Hamano8-15/+126
2014-12-22Merge branch 'jk/commit-date-approxidate'Junio C Hamano1-30/+18
2014-12-22Merge branch 'nd/split-index'Junio C Hamano1-1/+1
2014-12-22Merge branch 'jk/test-asan'Junio C Hamano2-0/+4
2014-12-22Merge branch 'ok/rebase-i-count-todo'Junio C Hamano1-1/+3
2014-12-22Merge branch 'jk/read-packed-refs-without-path-max'Junio C Hamano1-21/+25
2014-12-22Merge branch 'jk/always-allow-large-packets'Junio C Hamano2-18/+52
2014-12-22Merge branch 'jk/colors'Junio C Hamano6-54/+250
2014-12-22Merge branch 'rw/apply-does-not-take-ignore-date'Junio C Hamano1-1/+0
2014-12-22Merge branch 'js/test-hashmap-squelch-gcc'Junio C Hamano1-1/+1
2014-12-22Merge branch 'js/fsck-tag-validation'Junio C Hamano4-6/+11
2014-12-22Merge branch 'po/doc-assume-unchanged'Junio C Hamano2-14/+8
2014-12-22Merge branch 'mg/branch-d-m-f'Junio C Hamano2-4/+23
2014-12-22Merge branch 'tb/t0027-eol-conversion'Junio C Hamano1-16/+66
2014-12-22Merge branch 'jk/for-each-reflog-ent-reverse'Junio C Hamano2-12/+67
2014-12-22Merge branch 'sb/string-list'Junio C Hamano3-22/+18
2014-12-22Merge branch 'sv/doc-stripspace'Junio C Hamano1-0/+1
2014-12-22Merge branch 'rt/completion-tag'Junio C Hamano1-0/+10
2014-12-22Merge branch 'mg/doc-check-ignore-tracked-are-not-ignored'Junio C Hamano1-0/+3
2014-12-22Merge branch 'jk/credential-quit'Junio C Hamano6-5/+35
2014-12-22Merge branch 'dm/compat-s-ifmt-for-zos'Junio C Hamano5-7/+113
2014-12-22Merge branch 'ps/new-workdir-into-empty-directory'Junio C Hamano1-15/+38
2014-12-22Merge branch 'nd/ls-tree-pathspec'Junio C Hamano10-69/+74
2014-12-22Merge branch 'jc/hook-cleanup'Junio C Hamano2-21/+0
2014-12-22Merge branch 'rt/for-each-ref-spell-tcl-as-Tcl'Junio C Hamano1-1/+1
2014-12-22Merge branch 'rj/t0050-passes'Junio C Hamano1-1/+1
2014-12-22Merge branch 'js/push-to-deploy'Junio C Hamano3-2/+202
2014-12-22Merge branch 'jc/exec-cmd-system-path-leak-fix'Junio C Hamano4-12/+21
2014-12-22Merge branch 'mh/find-uniq-abbrev'Junio C Hamano1-1/+1
2014-12-22Merge branch 'pb/send-email-te'Junio C Hamano5-6/+227
2014-12-22Merge branch 'pb/am-message-id-footer'Junio C Hamano9-3/+126
2014-12-22Merge branch 'mh/simplify-repack-without-refs'Junio C Hamano13-70/+75
2014-12-22Merge branch 'dw/shell-basename-dashdash-before-stripping-leading-dash-from-l...Junio C Hamano1-1/+1
2014-12-22Merge branch 'rj/no-xopen-source-for-cygwin'Junio C Hamano1-1/+2
2014-12-22Merge branch 'js/t5000-dont-copy-bin-sh'Junio C Hamano1-1/+1
2014-12-22Merge branch 'jc/refer-to-t-readme-from-submitting-patches'Junio C Hamano2-2/+4
2014-12-22Merge branch 'tb/config-core-filemode-check-on-broken-fs'Junio C Hamano1-0/+2
2014-12-22Merge branch 'mg/add-ignore-errors'Junio C Hamano2-2/+8
2014-12-22Merge branch 'jk/lock-ref-sha1-basic-return-errors'Junio C Hamano1-2/+8
2014-12-22Merge branch 'cc/interpret-trailers-more'Junio C Hamano9-72/+170
2014-12-22Prepare for 2.2.2Junio C Hamano2-1/+34
2014-12-22Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maintJunio C Hamano1-4/+10
2014-12-22Merge branch 'jk/no-perl-tests' into maintJunio C Hamano3-4/+4