summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-03-06Git 2.3.2v2.3.2Junio C Hamano3-2/+14
2015-03-06Merge branch 'rj/no-xopen-source-for-cygwin' into maintJunio C Hamano1-6/+0
2015-03-06Merge branch 'rs/simple-cleanups' into maintJunio C Hamano4-13/+7
2015-03-06Merge branch 'mm/am-c-doc' into maintJunio C Hamano2-1/+9
2015-03-06Merge branch 'ew/svn-maint-fixes' into maintJunio C Hamano3-1/+13
2015-03-06Merge branch 'km/send-email-getopt-long-workarounds' into maintJunio C Hamano2-5/+15
2015-03-05Prepare for 2.3.2Junio C Hamano2-1/+69
2015-03-05Merge branch 'sb/plug-leak-in-make-cache-entry' into maintJunio C Hamano1-2/+8
2015-03-05Merge branch 'jk/fast-import-die-nicely-fix' into maintJunio C Hamano1-1/+5
2015-03-05Merge branch 'es/blame-commit-info-fix' into maintJunio C Hamano1-3/+2
2015-03-05Merge branch 'ab/merge-file-prefix' into maintJunio C Hamano2-2/+4
2015-03-05Merge branch 'ps/submodule-sanitize-path-upon-add' into maintJunio C Hamano2-1/+18
2015-03-05Merge branch 'jk/prune-mtime' into maintJunio C Hamano3-13/+48
2015-03-05Merge branch 'tc/curl-vernum-output-broken-in-7.11' into maintJunio C Hamano1-2/+2
2015-03-05Merge branch 'es/squelch-openssl-warnings-on-macosx' into maintJunio C Hamano1-3/+6
2015-03-05Merge branch 'jc/conf-var-doc' into maintJunio C Hamano2-8/+30
2015-03-05Merge branch 'av/wincred-with-at-in-username-fix' into maintJunio C Hamano1-3/+22
2015-03-05Merge branch 'ch/new-gpg-drops-rfc-1991' into maintJunio C Hamano2-0/+58
2015-03-05Merge branch 'jc/remote-set-url-doc' into maintJunio C Hamano1-6/+14
2015-03-05Merge branch 'jk/pack-bitmap' into maintJunio C Hamano1-1/+2
2015-03-05Merge branch 'jk/config-no-ungetc-eof' into maintJunio C Hamano2-3/+17
2015-03-05Merge branch 'jk/decimal-width-for-uintmax' into maintJunio C Hamano2-5/+5
2015-03-05Merge branch 'jc/push-cert' into maintJunio C Hamano1-1/+1
2015-03-05Merge branch 'mh/deref-symref-over-helper-transport' into maintJunio C Hamano3-6/+39
2015-03-05Merge branch 'ks/rebase-i-abbrev' into maintJunio C Hamano2-9/+15
2015-03-05Merge branch 'dp/remove-duplicated-header-inclusion' into maintJunio C Hamano4-4/+0
2015-03-05Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maintJunio C Hamano1-1/+1
2015-03-05Merge branch 'ak/git-pm-typofix' into maintJunio C Hamano1-2/+2
2015-03-05Merge branch 'jk/sanity' into maintJunio C Hamano4-9/+42
2015-02-26Git::SVN::*: avoid premature FileHandle closureKyle J. McKay2-0/+11
2015-02-26git-svn: fix localtime=true on non-glibc environmentsRyuichi Kokubo1-1/+2
2015-02-24Git 2.3.1v2.3.1Junio C Hamano4-3/+56
2015-02-24Merge branch 'ak/add-i-empty-candidates' into maintJunio C Hamano1-0/+5
2015-02-24Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano2-3/+149
2015-02-24Merge branch 'jc/doc-log-rev-list-options' into maintJunio C Hamano1-5/+7
2015-02-24Merge branch 'mg/commit-author-no-match-malformed-message' into maintJunio C Hamano1-1/+1
2015-02-24Merge branch 'jk/dumb-http-idx-fetch-fix' into maintJunio C Hamano2-1/+19
2015-02-24Merge branch 'jc/diff-format-doc' into maintJunio C Hamano1-1/+2
2015-02-24Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maintJunio C Hamano1-1/+1
2015-02-24Merge branch 'jk/status-read-branch-name-fix' into maintJunio C Hamano1-1/+1
2015-02-24Merge branch 'mg/push-repo-option-doc' into maintJunio C Hamano1-16/+2
2015-02-24Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maintJunio C Hamano1-0/+10
2015-02-24Merge branch 'dk/format-patch-ignore-diff-submodule' into maintJunio C Hamano2-1/+73
2015-02-24Merge branch 'jn/rerere-fail-on-auto-update-failure' into maintJunio C Hamano1-10/+6
2015-02-24Merge branch 'jk/blame-commit-label' into maintJunio C Hamano11-34/+29
2015-02-22git-compat-util.h: remove redundant codeRamsay Jones1-6/+0
2015-02-22sha1_name: use strlcpy() to copy stringsRené Scharfe1-6/+2
2015-02-22pretty: use starts_with() to check for a prefixRené Scharfe1-1/+1
2015-02-22for-each-ref: use skip_prefix() to avoid duplicate string comparisonRené Scharfe1-4/+3
2015-02-22connect: use strcmp() for string comparisonRené Scharfe1-2/+1
2015-02-20Documentation/git-am.txt: mention mailinfo.scissors config variableMatthieu Moy1-1/+2
2015-02-20Documentation/config.txt: document mailinfo.scissorsMatthieu Moy1-0/+7
2015-02-18Git.pm: two minor typo fixesAlexander Kuleshov1-2/+2
2015-02-17read-cache.c: free cache entry when refreshing failsStefan Beller1-2/+8
2015-02-16git-send-email.perl: support no- prefix with older GetOptionsKyle J. McKay2-5/+15
2015-02-15test-lib.sh: set prerequisite SANITY by testing what we really needTorsten Bögershausen1-3/+22
2015-02-13hex.c: reduce memory footprint of sha1_to_hex static buffersStefan Beller1-1/+1
2015-02-13do not include the same header twiceДилян Палаузов4-4/+0
2015-02-12transport-helper: fix typo in error message when --signed is not supportedMike Hommey1-1/+1
2015-02-11merge-file: correctly open files when in a subdirAleksander Boruch-Gruszecki2-2/+4
2015-02-10fast-import: avoid running end_packfile recursivelyJeff King1-1/+5
2015-02-10builtin/blame: destroy initialized commit_info onlyEric Sunshine1-3/+2
2015-02-09sha1_file: fix iterating loose alternate objectsJonathon Mah2-3/+18
2015-02-09for_each_loose_file_in_objdir: take an optional strbuf pathJeff King2-10/+30
2015-02-09git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIREDKyle J. McKay1-3/+6
2015-02-05Git 2.3v2.3.0Junio C Hamano3-1/+12
2015-02-05config_buf_ungetc: warn when pushing back a random characterJeff King1-2/+6
2015-02-05decimal_width: avoid integer overflowJeff King2-5/+5
2015-02-05config: do not ungetc EOFJeff King2-1/+11
2015-02-04ewah: fix building with gcc < 3.4.0Tom G. Christensen1-1/+2
2015-02-03Makefile: handle broken curl version number in version checkTom G. Christensen1-2/+2
2015-02-02git-submodule.sh: fix '/././' path normalizationPatrick Steinhardt2-1/+18
2015-02-02Merge git://github.com/git-l10n/git-poJunio C Hamano1-5/+5
2015-02-02CodingGuidelines: describe naming rules for configuration variablesJunio C Hamano1-0/+23
2015-01-30l10n: ca.po: Fix trailing whitespaceAlex Henrie1-5/+5
2015-01-29Documentation/git-remote.txt: stress that set-url is not for triangularJunio C Hamano1-6/+14
2015-01-29t/lib-gpg: sanity-check that we can actually signJeff King1-0/+2
2015-01-29t/lib-gpg: include separate public keys in keyring.gpgJeff King2-0/+56
2015-01-28diff-format doc: a score can follow M for rewriteJunio C Hamano1-1/+2
2015-01-28git-push.txt: document the behavior of --repoMichael J Gruber1-16/+2
2015-01-28do not check truth value of flex arraysJeff King1-1/+1
2015-01-28read_and_strip_branch: fix typo'd address-of operatorJeff King1-1/+1
2015-01-28config.txt: mark deprecated variables more prominentlyJunio C Hamano1-4/+4
2015-01-28config.txt: clarify that add.ignore-errors is deprecatedJunio C Hamano1-5/+4
2015-01-27Git 2.3.0-rc2v2.3.0-rc2Junio C Hamano1-1/+1
2015-01-27dumb-http: do not pass NULL path to parse_pack_indexJeff King2-1/+19
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-26commit: reword --author error messageMichael J Gruber1-1/+1
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-25wincred: fix get credential if username has "@"Aleksey Vasenev1-3/+22
2015-01-23Documentation: what does "git log --indexed-objects" even mean?Junio C Hamano1-5/+7
2015-01-22add -i: return from list_and_choose if there is no candidateAlexander Kuleshov1-0/+5
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-22apply: count the size of postimage correctlyJunio C Hamano1-2/+21
2015-01-22apply: make update_pre_post_images() sanity check the given postlenJunio C Hamano2-0/+127
2015-01-22apply.c: typofixJunio C Hamano1-1/+1
2015-01-22Fix unclosed here document in t3301.shKacper Kornet1-1/+1
2015-01-22rebase -i: use full object name internally throughout the scriptKirill A. Shutemov2-9/+15
2015-01-21transport-helper: do not request symbolic refs to remote helpersMike Hommey3-6/+39
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-16tests: correct misuses of POSIXPERMJunio C Hamano2-5/+14
2015-01-16t/lib-httpd: switch SANITY check for NOT_ROOTJeff King2-1/+6
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-13blame.c: fix garbled error messageLukas Fleischer1-5/+7
2015-01-13use xstrdup_or_null to replace ternary conditionalsJeff King7-10/+9
2015-01-13builtin/commit.c: use xstrdup_or_null instead of envdupJeff King1-9/+3
2015-01-13builtin/apply.c: use xstrdup_or_null instead of null_strdupJeff King1-10/+5
2015-01-13git-compat-util: add xstrdup_or_null helperJeff King1-0/+5
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-08rerere: error out on autoupdate failureJonathan Nieder1-10/+6
2015-01-08show-branch: line-wrap show-branch usageAlexander Kuleshov1-1/+4
2015-01-07remote-curl: fall back to Basic auth if Negotiate failsbrian m. carlson1-0/+10
2015-01-07format-patch: ignore diff.submodule settingDoug Kelly2-3/+3
2015-01-07t4255: test am submodule with diff.submoduleDoug Kelly1-0/+72
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