summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-08Merge tag 'l10n-2.4.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano10-8098/+18704
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-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-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-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-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-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
2015-03-24http: release the memory of a http pack request as wellStefan Beller1-0/+1
2015-03-24git.txt: list index versions in plain EnglishNguyễn Thái Ngọc Duy1-1/+2
2015-03-23Sync with v2.3.4Junio C Hamano2-1/+34
2015-03-23Post 2.3 cycle (batch #12)Junio C Hamano1-15/+46
2015-03-23Merge branch 'js/completion-ctags-pattern-substitution-fix'Junio C Hamano1-1/+1
2015-03-23Merge branch 'jk/push-config'Junio C Hamano4-9/+24
2015-03-23Merge branch 'nd/config-doc-camelCase'Junio C Hamano37-212/+212
2015-03-23Merge branch 'jk/test-annoyances'Junio C Hamano5-15/+24
2015-03-23Merge branch 'jk/smart-http-hide-refs'Junio C Hamano2-6/+21
2015-03-23Merge branch 'jk/tag-h-column-is-a-listing-option'Junio C Hamano1-2/+2
2015-03-23Git 2.3.4v2.3.4Junio C Hamano4-3/+36
2015-03-23Merge branch 'rs/use-isxdigit' into maintJunio C Hamano2-2/+2
2015-03-23Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano10-13/+2
2015-03-23Merge branch 'ak/git-done-help-cleanup' into maintJunio C Hamano1-3/+2
2015-03-23Merge branch 'sg/completion-remote' into maintJunio C Hamano2-5/+21
2015-03-23Merge branch 'mg/doc-status-color-slot' into maintJunio C Hamano2-2/+4
2015-03-23Merge branch 'jc/decorate-leaky-separator-color' into maintJunio C Hamano3-57/+84
2015-03-23Merge branch 'kn/git-cd-to-empty' into maintJunio C Hamano2-4/+16
2015-03-23Merge branch 'km/imap-send-libcurl-options' into maintJunio C Hamano2-3/+17
2015-03-23Merge branch 'mg/verify-commit' into maintJunio C Hamano1-2/+2
2015-03-23Merge branch 'es/rebase-i-count-todo' into maintJunio C Hamano2-1/+11
2015-03-23Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano3-80/+144
2015-03-23read-cache: fix memleakStefan Beller1-5/+2
2015-03-23add_to_index(): free unused cache-entryJunio C Hamano1-3/+5
2015-03-23commit.c: fix a memory leakStefan Beller1-2/+4
2015-03-23http-push: remove unneeded cleanupStefan Beller1-1/+0
2015-03-23merge-recursive: fix memleaksStefan Beller1-0/+3
2015-03-23merge-blobs.c: fix a memleakStefan Beller1-1/+3
2015-03-23builtin/apply.c: fix a memleakStefan Beller1-1/+3
2015-03-23l10n: ru: added Russian translationDimitriy Ryazantcev2-0/+10603
2015-03-22run-command: forbid using run_command with piped outputJeff King1-1/+6
2015-03-22trailer: use capture_commandJeff King1-13/+5
2015-03-22submodule: use capture_commandJeff King1-3/+1
2015-03-22wt-status: use capture_commandJeff King1-4/+1
2015-03-22run-command: introduce capture_command helperJeff King2-0/+29
2015-03-22completion: use __gitcomp_nl() for completing refsSZEDER Gábor1-2/+2
2015-03-22wt_status: fix signedness mismatch in strbuf_read callJeff King1-3/+3
2015-03-22wt-status: don't flush before running "submodule status"Jeff King1-1/+0
2015-03-22update-index: fix a memleakStefan Beller1-0/+1
2015-03-22read-cache: free cache entry in add_to_index in case of early returnStefan Beller1-2/+5
2015-03-22t6039: fix broken && chainTorsten Bögershausen1-1/+1
2015-03-20read-cache: fix reading of split indexThomas Gummerer1-19/+23
2015-03-20Post 2.3 cycle (batch #11)Junio C Hamano1-0/+64
2015-03-20Merge branch 'mg/log-decorate-HEAD'Junio C Hamano3-13/+72
2015-03-20Merge branch 'jc/decorate-leaky-separator-color'Junio C Hamano3-57/+82
2015-03-20Merge branch 'sb/leaks'Junio C Hamano3-7/+8
2015-03-20Merge branch 'rs/use-isxdigit'Junio C Hamano2-2/+2
2015-03-20Merge branch 'mg/verify-commit'Junio C Hamano1-2/+2
2015-03-20Merge branch 'km/imap-send-libcurl-options'Junio C Hamano2-3/+17
2015-03-20Merge branch 'km/bsd-sysctl'Junio C Hamano5-1/+54
2015-03-20Merge branch 'km/bsd-shells'Junio C Hamano5-8/+9
2015-03-20Merge branch 'rs/daemon-hostname-in-strbuf'Junio C Hamano1-83/+82
2015-03-20Merge branch 'mg/detached-head-report'Junio C Hamano4-7/+52
2015-03-20Merge branch 'kn/git-cd-to-empty'Junio C Hamano2-4/+16
2015-03-20Merge branch 'nd/versioncmp-prereleases'Junio C Hamano3-0/+90
2015-03-20refs.c: drop curate_packed_refsJeff King2-67/+2
2015-03-20repack: turn on "ref paranoia" when doing a destructive repackJeff King2-3/+7
2015-03-20prune: turn on ref_paranoia flagJeff King2-2/+3
2015-03-20refs: introduce a "ref paranoia" flagJeff King4-0/+25
2015-03-20t5312: test object deletion code paths in a corrupted repositoryJeff King1-0/+114
2015-03-20t1700: make test pass with index-v4Thomas Gummerer1-3/+12
2015-03-20t9158, t9161: fix broken &&-chain in git-svn testsMichael J Gruber2-7/+7
2015-03-20t9104: fix test for following larger parentsMichael J Gruber1-4/+6
2015-03-20t4104: drop hand-rolled error reportingJeff King1-8/+2
2015-03-20t0005: fix broken &&-chainsJeff King1-2/+2
2015-03-20t7004: fix embedded single-quotesJeff King1-1/+1
2015-03-20t0050: appease --chain-lintJeff King1-4/+8
2015-03-20t9001: use test_when_finishedJeff King1-20/+10
2015-03-20t4117: use modern test_* helpersJeff King1-56/+10
2015-03-20t6034: use modern test_* helpersJeff King1-53/+13
2015-03-20t1301: use modern test_* helpersJeff King1-13/+7
2015-03-20t0020: use modern test_* helpersJeff King1-116/+28
2015-03-20t6030: use modern test_* helpersJeff King1-60/+31
2015-03-20t9502: fix &&-chain breakageJeff King1-4/+6
2015-03-20t7201: fix &&-chain breakageJeff King1-13/+6
2015-03-20t3600: fix &&-chain breakage for setup commandsJeff King1-18/+18
2015-03-20t: avoid using ":" for commentsJeff King2-10/+10
2015-03-20t: wrap complicated expect_code users in a blockJeff King4-9/+13
2015-03-20t: use test_expect_code instead of hand-rolled comparisonJeff King3-44/+38
2015-03-20t: use test_might_fail for diff and grepJeff King2-6/+6
2015-03-20t: fix &&-chaining issues around setup which might failJeff King5-8/+11
2015-03-20t: use test_must_fail instead of hand-rolled blocksJeff King3-14/+5
2015-03-20t: use verbose instead of hand-rolled errorsJeff King5-45/+10
2015-03-20t: assume test_cmp produces verbose outputJeff King2-12/+3