summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-05-13Git 2.4.1v2.4.1Junio C Hamano4-3/+44
2015-05-13Merge branch 'sb/line-log-plug-pairdiff-leak' into maintJunio C Hamano1-0/+1
2015-05-13Merge branch 'sb/test-bitmap-free-at-end' into maintJunio C Hamano1-0/+2
2015-05-13Merge branch 'nd/t1509-chroot-test' into maintJunio C Hamano1-9/+29
2015-05-13Merge branch 'jk/type-from-string-gently' into maintJunio C Hamano2-1/+10
2015-05-13Merge branch 'ep/fix-test-lib-functions-report' into maintJunio C Hamano1-2/+2
2015-05-13Merge branch 'cn/bom-in-gitignore' into maintJunio C Hamano6-5/+39
2015-05-13Merge branch 'jk/prune-mtime' into maintJunio C Hamano3-9/+26
2015-05-13Merge branch 'jk/init-core-worktree-at-root' into maintJunio C Hamano1-3/+15
2015-05-11Sync with 2.3.8Junio C Hamano12-25/+149
2015-05-11Git 2.3.8v2.3.8Junio C Hamano4-3/+26
2015-05-11Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3Junio C Hamano6-15/+16
2015-05-11Merge branch 'jc/diff-no-index-d-f' into maint-2.3Junio C Hamano2-2/+98
2015-05-11Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3Junio C Hamano1-2/+2
2015-05-11Merge branch 'jc/epochtime-wo-tz' into maint-2.3Junio C Hamano1-5/+9
2015-04-30Git 2.4v2.4.0Junio C Hamano2-1/+6
2015-04-28Merge branch 'mh/multimail-renewal'Junio C Hamano2-24/+25
2015-04-28Merge branch 'mg/show-notes-doc'Junio C Hamano1-2/+2
2015-04-28Merge branch 'nd/versioncmp-prereleases'Junio C Hamano1-4/+7
2015-04-28Merge branch 'mg/status-v-v'Junio C Hamano1-0/+8
2015-04-28Update git-multimail to version 1.0.2Michael Haggerty2-24/+25
2015-04-27Sync with 2.3.7Junio C Hamano2-1/+23
2015-04-27Git 2.3.7v2.3.7Junio C Hamano4-3/+25
2015-04-27Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano3-16/+24
2015-04-27Merge branch 'ma/bash-completion-leaking-x' into maintJunio C Hamano1-1/+1
2015-04-27Merge branch 'jc/push-cert' into maintJunio C Hamano1-0/+23
2015-04-23status: document the -v/--verbose optionMichael Haggerty1-0/+8
2015-04-23RelNotes: wordsmithingMichael Haggerty1-164/+172
2015-04-23RelNotes: refer to the rebase -i "todo list", not "insn sheet"Michael Haggerty1-2/+2
2015-04-23RelNotes: correct name of versionsort.prereleaseSuffixMichael Haggerty1-2/+2
2015-04-23git tag: mention versionsort.prereleaseSuffix in manpageMichael Haggerty1-4/+7
2015-04-22Git 2.4.0-rc3v2.4.0-rc3Junio C Hamano1-1/+1
2015-04-21Sync with maintJunio C Hamano2-1/+15
2015-04-21Git 2.3.6v2.3.6Junio C Hamano4-3/+17
2015-04-21Merge branch 'jk/colors' into maintJunio C Hamano1-2/+7
2015-04-21Merge branch 'jk/test-annoyances' into maintJunio C Hamano5-15/+24
2015-04-21Merge branch 'pt/enter-repo-comment-fix' into maintJunio C Hamano1-8/+3
2015-04-21Merge branch 'jz/gitweb-conf-doc-fix' into maintJunio C Hamano1-1/+1
2015-04-21Merge branch 'jk/cherry-pick-docfix' into maintJunio C Hamano1-1/+2
2015-04-21Merge branch 'iu/fix-parse-options-h-comment' into maintJunio C Hamano1-2/+1
2015-04-21Merge branch 'jg/cguide-we-cannot-count' into maintJunio C Hamano1-1/+1
2015-04-21Merge branch 'jk/pack-corruption-post-mortem' into maintJunio C Hamano1-0/+237
2015-04-21Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maintJunio C Hamano1-4/+0
2015-04-21RelNotes: "merge --quiet" change has been revertedJunio C Hamano1-4/+0
2015-04-20Hopefully the last batch for 2.4Junio C Hamano1-1/+18
2015-04-20Merge branch 'ps/grep-help-all-callback-arg'Junio C Hamano1-1/+1
2015-04-20Merge branch 'tb/connect-ipv6-parse-fix'Junio C Hamano3-16/+24
2015-04-20Merge branch 'va/fix-git-p4-tests'Junio C Hamano1-12/+31
2015-04-20Merge branch 'jc/push-cert'Junio C Hamano1-0/+23
2015-04-20Merge branch 'ma/bash-completion-leaking-x'Junio C Hamano1-1/+1
2015-04-20sha1_file: only freshen packs once per runJeff King2-1/+9
2015-04-20sha1_file: freshen pack objects before looseJeff King1-1/+1
2015-04-20reachable: only mark local objects as recentJeff King3-7/+16
2015-04-20log -L: improve error message on malformed argumentMatthieu Moy2-5/+5
2015-04-20Documentation: change -L:<regex> to -L:<funcname>Matthieu Moy4-10/+11
2015-04-18Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-guiJunio C Hamano10-1773/+4690
2015-04-18t1509: update prepare script to be able to run t1509 in chroot againNguyễn Thái Ngọc Duy1-9/+29
2015-04-18git-gui: set version 0.20gitgui-0.20.0Pat Thoyts1-1/+1
2015-04-18git-gui: sv.po: Update Swedish translation (547t0f0u)Peter Krefting1-1431/+1562
2015-04-18git-gui i18n: Updated Bulgarian translation (547t,0f,0u)Alexander Shopov1-1498/+1528
2015-04-17type_from_string_gently: make sure length matchesJeff King2-1/+10
2015-04-17config: fix settings in default_user_config templateOssi Herrala1-2/+2
2015-04-17rev-list-options.txt: complete sentence about notes matchingMichael J Gruber1-2/+2
2015-04-16test-lib-functions.sh: fix the second argument to some helper functionsElia Pinto1-2/+2
2015-04-16attr: skip UTF8 BOM at the beginning of the input fileJunio C Hamano1-2/+7
2015-04-16config: use utf8_bom[] from utf.[ch] in git_parse_source()Junio C Hamano1-3/+3
2015-04-16utf8-bom: introduce skip_utf8_bom() helperJunio C Hamano3-5/+18
2015-04-16add_excludes_from_file: clarify the bom skipping logicJunio C Hamano1-4/+5
2015-04-16dir: allow a BOM at the beginning of exclude filesCarlos Martín Nieto2-1/+16
2015-04-16Revert "merge: pass verbosity flag down to merge-recursive"Junio C Hamano1-4/+0
2015-04-15parse_date_basic(): let the system handle DST conversionJunio C Hamano1-2/+6
2015-04-15parse_date_basic(): return early when given a bogus timestampJunio C Hamano1-3/+3
2015-04-14Git 2.4.0-rc2v2.4.0-rc2Junio C Hamano2-3/+20
2015-04-14Merge branch 'jk/colors'Junio C Hamano1-2/+7
2015-04-14Merge branch 'jk/merge-quiet'Junio C Hamano1-0/+4
2015-04-14Merge branch 'jk/pack-corruption-post-mortem'Junio C Hamano1-0/+237
2015-04-14Merge branch 'jc/update-instead-into-void'Junio C Hamano2-2/+74
2015-04-14Merge branch 'sb/plug-streaming-leak'Junio C Hamano1-1/+4
2015-04-14Merge branch 'jn/doc-fast-import-no-16-octopus-limit'Junio C Hamano1-4/+0
2015-04-14Merge branch 'sb/plug-wt-shortstatus-tracking-leak'Junio C Hamano1-0/+1
2015-04-14Merge branch 'pt/enter-repo-comment-fix'Junio C Hamano1-8/+3
2015-04-14Merge branch 'jz/gitweb-conf-doc-fix'Junio C Hamano1-1/+1
2015-04-14Merge branch 'jk/cherry-pick-docfix'Junio C Hamano1-1/+2
2015-04-14Merge branch 'iu/fix-parse-options-h-comment'Junio C Hamano1-2/+1
2015-04-14Merge branch 'jg/cguide-we-cannot-count'Junio C Hamano1-1/+1
2015-04-14CodingGuidelines: update 'rough' rule countJulian Gindi1-1/+1
2015-04-12grep: correctly initialize help-all optionPatrick Steinhardt1-1/+1
2015-04-12completion: fix global bash variable leak on __gitcompappendMárcio Almada1-1/+1
2015-04-12pack-bitmap.c: fix a memleakStefan Beller1-0/+2
2015-04-12t9814: guarantee only one source exists in git-p4 copy testsVitor Antunes1-15/+31
2015-04-08Merge tag 'l10n-2.4.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano10-8098/+18704
2015-04-08connect.c: ignore extra colon after hostnameTorsten Bögershausen3-16/+24
2015-04-09Merge branch 'master' of git://github.com/alexhenrie/git-poJiang Xin1-236/+236
2015-04-09l10n: TEAMS: Change repository URL of zh_CNJiang Xin1-1/+1
2015-04-07l10n: ca.po: update translationAlex Henrie1-236/+236
2015-04-07l10n: Updated Bulgarian translation of git (2305t,0f,0u)Alexander Shopov1-1436/+1456
2015-04-07l10n: sv.po: Update Swedish translation (2305t0f0u)Peter Krefting1-241/+244
2015-04-05l10n: de.po: translate one messageRalf Thielow1-239/+248
2015-04-04diff-highlight: do not split multibyte charactersKyle J. McKay1-2/+7
2015-04-04l10n: fr.po v2.4.0 round 2Jean-Noel Avila1-255/+291
2015-04-03l10n: ru: updated Russian translationDimitriy Ryazantcev1-238/+238
2015-04-03l10n: vi.po(2305t): Updated 1 new stringTran Ngoc Quan1-244/+247
2015-04-03l10n: zh_CN: for git v2.4.0 l10n round 2Jiang Xin1-235/+235
2015-04-03l10n: git.pot: v2.4.0 round 2 (1 update)Jiang Xin1-233/+233
2015-04-03Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin9-6348/+16883
2015-04-02merge: pass verbosity flag down to merge-recursiveJeff King1-0/+4
2015-04-02Git 2.4.0-rc1v2.4.0-rc1Junio C Hamano2-3/+4
2015-04-02Merge branch 'sb/atomic-push'Junio C Hamano1-1/+1
2015-04-02init: don't set core.worktree when initializing /.gitJeff King1-3/+15
2015-04-02push --signed: tighten what the receiving end can ask to signJunio C Hamano1-0/+23
2015-04-02send-pack: unify error messages for unsupported capabilitiesRalf Thielow1-1/+1
2015-04-02l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung'Matthias Rüster1-9/+9
2015-04-02l10n: de.po: translate 99 new messagesRalf Thielow1-851/+899
2015-04-02l10n: de.po: fix messages with abbreviated hashsRalf Thielow1-2/+2
2015-04-02l10n: de.po: add space before ellipsisPhillip Sz1-11/+11
2015-04-01howto: document more tools for recovery corruptionJeff King1-0/+237
2015-04-01push-to-deploy: allow pushing into an unborn branch and updating itJunio C Hamano2-2/+74
2015-03-31fast-import doc: remove suggested 16-parent limitJonathan Nieder1-4/+0
2015-03-31Sync with 2.3.5Junio C Hamano3-2/+8
2015-03-31Git 2.3.5v2.3.5Junio C Hamano3-2/+6
2015-03-31Merge branch 'ss/pull-rebase-preserve' into maintJunio C Hamano2-4/+5
2015-03-31Merge branch 'jc/report-path-error-to-dir' into maintJunio C Hamano4-44/+44
2015-03-31Merge branch 'ph/push-doc-cas' into maintJunio C Hamano1-8/+6
2015-03-31gitweb.conf.txt: say "build-time", not "built-time"Jérôme Zago1-1/+1
2015-03-31streaming.c: fix a memleakJohn Keeping1-1/+4
2015-03-31enter_repo(): fix docs to match codePaul Tan1-8/+3
2015-03-30wt-status.c: fix a memleakStefan Beller1-0/+1
2015-03-30line-log.c: fix a memleakStefan Beller1-0/+1
2015-03-30cherry-pick: fix docs describing handling of empty commitsJeff King1-1/+2
2015-03-31l10n: vi.po: Updated Vietnamese translationTran Ngoc Quan1-866/+918
2015-03-31l10n: zh_CN: translations for git v2.4.0-rc0Jiang Xin1-1233/+887
2015-03-31Merge branch 'fr-v2.4.0-rc0' of git://github.com/jnavila/gitJiang Xin1-890/+908
2015-03-30docs: clarify what git-rebase's "-p" / "--preserve-merges" doesSebastian Schuberth1-1/+3
2015-03-30l10n: fr.po v2.4.0-rc0 round 1Jean-Noel Avila1-890/+908
2015-03-29parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defvalIvan Ukhov1-2/+1
2015-03-28l10n: ca.po: update translationAlex Henrie1-873/+912
2015-03-28Sync with maintJunio C Hamano2-1/+42
2015-03-28RelNotes: minor doc updatesJunio C Hamano1-1/+3
2015-03-28Merge branch 'ph/push-doc-cas'Junio C Hamano1-8/+6
2015-03-28Merge branch 'ss/pull-rebase-preserve'Junio C Hamano1-3/+2
2015-03-28Prepare for 2.3.5Junio C Hamano2-1/+42
2015-03-28Merge branch 'sg/completion-gitcomp-nl-for-refs' into maintJunio C Hamano1-2/+2
2015-03-28Merge branch 'jk/simplify-csum-file-sha1fd-check' into maintJunio C Hamano1-7/+3
2015-03-28Merge branch 'tg/test-index-v4' into maintJunio C Hamano1-3/+12
2015-03-28Merge branch 'nd/doc-git-index-version' into maintJunio C Hamano1-1/+2
2015-03-28Merge branch 'ct/prompt-untracked-fix' into maintJunio C Hamano2-1/+12
2015-03-28Merge branch 'ws/grep-quiet-no-pager' into maintJunio C Hamano1-1/+1
2015-03-28Merge branch 'jc/submitting-patches-mention-send-email' into maintJunio C Hamano1-0/+5
2015-03-28Merge branch 'jk/cleanup-failed-clone' into maintJunio C Hamano1-5/+6
2015-03-28Merge branch 'jk/fetch-pack' into maintJunio C Hamano3-13/+22
2015-03-28Merge branch 'tg/fix-check-order-with-split-index' into maintJunio C Hamano1-19/+23
2015-03-28Merge branch 'jk/prune-with-corrupt-refs' into maintJunio C Hamano7-68/+147
2015-03-282.3.2 release notes: typofixThomas Ackermann1-1/+1
2015-03-28Merge branch 'jn/doc-api-errors'Junio C Hamano1-1/+1
2015-03-28api-error-handling doc: typofixThomas Ackermann1-1/+1
2015-03-28git-p4: fix copy detection testVitor Antunes1-1/+4
2015-03-28t9814: fix broken shell syntax in git-p4 rename testVitor Antunes1-2/+2
2015-03-27Sync with maintJunio C Hamano1-0/+1
2015-03-27Merge branch 'sb/leaks'Junio C Hamano8-15/+27
2015-03-27Merge branch 'jk/tag-h-column-is-a-listing-option' into maintJunio C Hamano1-2/+2
2015-03-27Merge branch 'jk/smart-http-hide-refs' into maintJunio C Hamano2-6/+21
2015-03-27Merge branch 'js/completion-ctags-pattern-substitution-fix' into maintJunio C Hamano1-1/+1
2015-03-27Update mailmap to spell out "Alexander Kuleshov"Junio C Hamano1-0/+1
2015-03-27l10n: ru: updated Russian translationDimitriy Ryazantcev1-848/+883
2015-03-27l10n: sv.po: Update Swedish translation (2305t0f0u)Peter Krefting1-848/+899
2015-03-27Merge branch 'maint'Jiang Xin1-1/+1
2015-03-27l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)Jiang Xin1-766/+801
2015-03-27Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2-0/+10603
2015-03-26diff-no-index: align D/F handling with that of normal GitJunio C Hamano2-2/+33
2015-03-26docs: clarify "preserve" option wording for git-pullSebastian Schuberth1-3/+2
2015-03-26Git 2.4.0-rc0v2.4.0-rc0Junio C Hamano2-1/+8
2015-03-26Merge branch 'jk/test-chain-lint'Junio C Hamano102-773/+459
2015-03-26Merge branch 'sg/completion-gitcomp-nl-for-refs'Junio C Hamano1-2/+2
2015-03-26Merge branch 'jc/report-path-error-to-dir'Junio C Hamano4-44/+44
2015-03-26git-push.txt: clean up force-with-lease wordingPhil Hord1-8/+6
2015-03-25diff-no-index: DWIM "diff D F" into "diff D/F F"Junio C Hamano2-0/+65
2015-03-25Getting ready for -rc0Junio C Hamano1-0/+52
2015-03-25Merge branch 'nd/doc-git-index-version'Junio C Hamano1-1/+2
2015-03-25Merge branch 'jk/run-command-capture'Junio C Hamano5-24/+44
2015-03-25Merge branch 'tg/test-index-v4'Junio C Hamano1-3/+12
2015-03-25Merge branch 'jk/prune-with-corrupt-refs'Junio C Hamano7-68/+147
2015-03-25Merge branch 'tg/fix-check-order-with-split-index'Junio C Hamano1-19/+23
2015-03-25Merge branch 'jk/fetch-pack'Junio C Hamano3-13/+22
2015-03-25Merge branch 'jk/cleanup-failed-clone'Junio C Hamano1-5/+6
2015-03-25Merge branch 'jc/submitting-patches-mention-send-email'Junio C Hamano1-0/+5
2015-03-25Merge branch 'dj/log-graph-with-no-walk'Junio C Hamano6-7/+23
2015-03-25Merge branch 'kd/rev-list-bisect-first-parent'Junio C Hamano3-3/+11
2015-03-25Merge branch 'ws/grep-quiet-no-pager'Junio C Hamano1-1/+1
2015-03-25Merge branch 'jk/simplify-csum-file-sha1fd-check'Junio C Hamano1-7/+3
2015-03-25Merge branch 'ct/prompt-untracked-fix'Junio C Hamano2-1/+12
2015-03-25t9001: drop save_confirm helperJeff King1-10/+5
2015-03-25t0020: use test_* helpers instead of hand-rolled messagesJeff King1-33/+5
2015-03-25t: simplify loop exit-code status variablesJeff King2-16/+6
2015-03-25t: fix some trivial cases of ignored exit codes in loopsJeff King10-28/+24
2015-03-25t7701: fix ignored exit code inside loopJeff King1-1/+1
2015-03-25t3305: fix ignored exit code inside loopJeff King1-6/+3
2015-03-25t0020: fix ignored exit code inside loopsJeff King1-35/+19
2015-03-25perf-lib: fix ignored exit code inside loopJeff King1-1/+1
2015-03-24Merge branch 'master' of git://ozlabs.org/~paulus/gitkJunio C Hamano13-3482/+6449
2015-03-24report_path_error(): move to dir.cJunio C Hamano4-44/+44