summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-10-28Git 1.8.4.2v1.8.4.2Junio C Hamano3-2/+17
2013-10-28Merge branch 'jk/clone-progress-to-stderr' into maintJunio C Hamano4-28/+32
2013-10-28Merge branch 'jk/format-patch-from' into maintJunio C Hamano4-1/+49
2013-10-28Merge branch 'jk/shortlog-tolerate-broken-commit' into maintJunio C Hamano2-2/+20
2013-10-28Merge branch 'jk/diff-algo' into maintJunio C Hamano1-2/+2
2013-10-28test-lib: fix typo in commentTorstein Hegge1-1/+1
2013-10-28sha1_file: move comment about return value where it belongsChristian Couder1-1/+1
2013-10-23Almost 1.8.4.2 ;-)Junio C Hamano1-0/+13
2013-10-23Merge branch 'jc/ls-files-killed-optim' into maintJunio C Hamano4-17/+67
2013-10-23Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano4-8/+45
2013-10-23Merge branch 'nd/fetch-into-shallow' into maintJunio C Hamano12-160/+152
2013-10-18git-merge: document the -S optionNicolas Vigier1-1/+5
2013-10-17Start preparing for 1.8.4.2Junio C Hamano2-1/+51
2013-10-17Merge branch 'jk/upload-pack-keepalive' into maintJunio C Hamano2-1/+35
2013-10-17Merge branch 'bc/http-backend-allow-405' into maintJunio C Hamano1-2/+4
2013-10-17Merge branch 'jc/cvsserver-perm-bit-fix' into maintJunio C Hamano1-1/+1
2013-10-17Merge branch 'js/add-i-mingw' into maintJunio C Hamano1-1/+1
2013-10-17Merge branch 'nd/git-dir-pointing-at-gitfile' into maintJunio C Hamano2-5/+8
2013-10-17Merge branch 'jk/has-sha1-file-retry-packed' into maintJunio C Hamano1-1/+4
2013-10-17Merge branch 'ap/commit-author-mailmap' into maintJunio C Hamano2-1/+18
2013-10-17Merge branch 'es/rebase-i-no-abbrev' into maintJunio C Hamano2-2/+117
2013-10-17Merge branch 'rt/rebase-p-no-merge-summary' into maintJunio C Hamano2-1/+25
2013-10-17Merge branch 'es/rebase-i-respect-core-commentchar' into maintJunio C Hamano1-1/+1
2013-10-17t4254: modernize testsSZEDER Gábor1-21/+15
2013-10-15git-prune-packed.txt: fix reference to GIT_OBJECT_DIRECTORYSteffen Prohaska1-1/+1
2013-10-14clone --branch: refuse to clone if upstream repo is emptyRalf Thielow2-1/+11
2013-09-26Git 1.8.4.1v1.8.4.1Jonathan Nieder3-15/+37
2013-09-26merge-recursive: fix parsing of "diff-algorithm" optionJohn Keeping1-2/+2
2013-09-26Merge branch 'mm/rebase-continue-freebsd-WB' into maintJonathan Nieder1-1/+10
2013-09-26Merge branch 'km/svn-1.8-serf-only' into maintJonathan Nieder2-3/+34
2013-09-26Merge branch 'js/xread-in-full' into maintJonathan Nieder1-1/+1
2013-09-26Merge branch 'bc/send-email-ssl-die-message-fix' into maintJonathan Nieder1-1/+1
2013-09-24git-remote-mediawiki: bugfix for pages w/ >500 revisionsBenoit Person2-2/+35
2013-09-20format-patch: print in-body "From" only when neededJeff King4-1/+49
2013-09-18shortlog: ignore commits with missing authorsJeff King2-2/+20
2013-09-18clone: always set transport optionsJeff King2-16/+18
2013-09-18clone: treat "checking connectivity" like other progressJeff King2-3/+4
2013-09-18clone: send diagnostic messages to stderrJeff King3-10/+11
2013-09-18Start preparing for 1.8.4.1Junio C Hamano2-1/+51
2013-09-18Merge branch 'bc/completion-for-bash-3.0' into maintJunio C Hamano3-3/+7
2013-09-18Merge branch 'mm/no-shell-escape-in-die-message' into maintJunio C Hamano2-1/+14
2013-09-18Merge branch 'jl/some-submodule-config-are-not-boolean' into maintJunio C Hamano2-0/+16
2013-09-18Merge branch 'tr/log-full-diff-keep-true-parents' into maintJunio C Hamano8-3/+134
2013-09-18Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' into maintJunio C Hamano4-31/+134
2013-09-18Merge branch 'sp/clip-read-write-to-8mb' into maintJunio C Hamano6-27/+26
2013-09-18Merge branch 'jk/mailmap-incomplete-line' into maintJunio C Hamano2-13/+24
2013-09-17t3200: fix failure on case-insensitive filesystemsEric Sunshine1-0/+1
2013-09-17t7406-submodule-update: add missing &&Tay Ray Chuan1-1/+1
2013-09-12http-backend: provide Allow header for 405Brian M. Carlson1-2/+4
2013-09-11Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano1-11/+11
2013-09-11cvsserver: pick up the right mode bitsJunio C Hamano1-1/+1
2013-09-10send-email: don't call methods on undefined valuesBrian M. Carlson1-1/+1
2013-09-09upload-pack: bump keepalive default to 5 secondsJeff King2-2/+2
2013-09-09upload-pack: send keepalive packets during pack computationJeff King2-1/+35
2013-09-09branch.c: Relax unnecessary requirement on upstream's remote ref namePer Cederqvist2-3/+2
2013-09-09t3200: Add test demonstrating minor regression in 41c21f2Johan Herland1-0/+34
2013-09-09Refer to branch.<name>.remote/merge when documenting --trackJohan Herland1-2/+4
2013-09-09t3200: Minor fix when preparing for tracking failureJohan Herland1-1/+2
2013-09-09t2024: Fix &&-chaining and a couple of typosJohan Herland1-3/+3
2013-09-09rebase: fix run_specific_rebase's use of "return" on FreeBSDMatthieu Moy1-1/+10
2013-09-08l10n: de.po: use "das Tag" instead of "der Tag"Ralf Thielow1-11/+11
2013-09-05Merge branch 'nd/fetch-pack-shallow-fix' into maintJunio C Hamano2-1/+19
2013-09-05Merge branch 'hv/config-from-blob' into maintJunio C Hamano1-16/+16
2013-09-05Merge branch 'maint-1.8.3' into maintJunio C Hamano1-2/+2
2013-09-05Merge branch 'maint-1.8.2' into maint-1.8.3Junio C Hamano1-2/+2
2013-09-05Documentation/git-merge.txt: fix formatting of example blockAndreas Schwab1-2/+2
2013-09-04add--interactive: fix external command invocation on WindowsJohannes Sixt1-1/+1
2013-09-03Merge git://github.com/git-l10n/git-po into maintJunio C Hamano2-718/+874
2013-09-03Merge branch 'maint-1.8.3' into maintJunio C Hamano1-0/+1
2013-09-03Merge branch 'maint-1.8.2' into maint-1.8.3Junio C Hamano1-0/+1
2013-09-03Make setup_git_env() resolve .git file when $GIT_DIR is not specifiedNguyễn Thái Ngọc Duy2-5/+8
2013-08-30has_sha1_file: re-check pack directory before giving upJeff King1-1/+4
2013-08-30fix shell syntax error in templateThorsten Glaser1-0/+1
2013-08-30l10n: fr.po: hotfix for commit 6b388fcSebastien Helleu2-718/+874
2013-08-28builtin/fetch.c: Fix a sparse warningRamsay Jones1-1/+1
2013-08-28mailmap: handle mailmap blobs without trailing newlinesJeff King2-13/+24
2013-08-28Add testcase for needless objects during a shallow fetchMatthijs Kooijman1-0/+11
2013-08-28list-objects: mark more commits as edges in mark_edges_uninterestingNguyễn Thái Ngọc Duy1-0/+17
2013-08-28list-objects: reduce one argument in mark_edges_uninterestingNguyễn Thái Ngọc Duy6-9/+8
2013-08-28upload-pack: delegate rev walking in shallow fetch to pack-objectsNguyễn Thái Ngọc Duy2-99/+32
2013-08-28shallow: add setup_temporary_shallow()Nguyễn Thái Ngọc Duy2-0/+24
2013-08-28shallow: only add shallow graft points to new shallow fileNguyễn Thái Ngọc Duy1-0/+2
2013-08-26config: do not use C function names as struct membersJeff King1-16/+16
2013-08-25rebase -i: fix short SHA-1 collisionJunio C Hamano2-1/+31
2013-08-25t3404: rebase -i: demonstrate short SHA-1 collisionEric Sunshine1-0/+24
2013-08-25t3404: make tests more self-containedEric Sunshine1-2/+63
2013-08-25fetch-pack: do not remove .git/shallow file when --depth is not specifiedNguyễn Thái Ngọc Duy2-1/+19
2013-08-24commit: search author pattern against mailmapAntoine Pelisse2-1/+18
2013-08-23dir.c::test_one_path(): work around directory_exists_in_index_icase() breakageEric Sunshine2-9/+24
2013-08-23Git 1.8.4v1.8.4Junio C Hamano2-1/+6
2013-08-22contrib/git-prompt.sh: handle missing 'printf -v' more gracefullyBrandon Casey1-1/+5
2013-08-21t9902-completion.sh: old Bash still does not support array+=('') notationBrandon Casey1-1/+1
2013-08-21git-completion.bash: use correct Bash/Zsh array length syntaxBrandon Casey1-1/+1
2013-08-21rebase --preserve-merges: ignore "merge.log" configRalf Thielow2-1/+25
2013-08-21Typofix draft release notes to 1.8.4Junio C Hamano1-2/+2
2013-08-20stream_to_pack: xread does not guarantee to read all requested bytesJohannes Sixt1-1/+1
2013-08-20Revert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU"Steffen Prohaska4-27/+0
2013-08-20xread, xwrite: limit size of IO to 8MBSteffen Prohaska2-0/+26
2013-08-19avoid segfault on submodule.*.path set to an empty "true"Jharrod LaFon2-0/+16
2013-08-19Git 1.8.4-rc4v1.8.4-rc4Junio C Hamano2-10/+1
2013-08-18rebase -i: fix cases ignoring core.commentcharEric Sunshine1-1/+1
2013-08-18move setup_alternate_shallow and write_shallow_commits to shallow.cNguyễn Thái Ngọc Duy3-52/+58
2013-08-15t3010: update to demonstrate "ls-files -k" optimization pitfallsJunio C Hamano1-3/+9
2013-08-15ls-files -k: a directory only can be killed if the index has a non-directoryJunio C Hamano3-3/+31
2013-08-15dir.c: use the cache_* macro to access the current indexJunio C Hamano1-6/+5
2013-08-14Revert "Add new @ shortcut for HEAD"Junio C Hamano5-28/+0
2013-08-14Revert "git stash: avoid data loss when "git stash save" kills a directory"Junio C Hamano3-40/+2
2013-08-13Git 1.8.4-rc3v1.8.4-rc3Junio C Hamano1-1/+1
2013-08-13Merge git://github.com/git-l10n/git-poJunio C Hamano2-0/+9672
2013-08-13Merge branch 'sb/mailmap-updates'Junio C Hamano1-2/+16
2013-08-13.mailmap: Combine more (name, email) to individual personsStefan Beller1-1/+3
2013-08-13.mailmap: update long-lost friends with multiple defunct addressesJunio C Hamano1-1/+13
2013-08-13git-remote-mediawiki: ignore generated git-mwMatthieu Moy1-0/+1
2013-08-11l10n: Add reference for french translation teamJean-Noel Avila1-0/+4
2013-08-11l10n: fr.po: 821/2112 messages translatedJean-Noel Avila1-0/+9668
2013-08-09Merge branch 'maint'Junio C Hamano1-1/+1
2013-08-09Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano5-4414/+5144
2013-08-09Merge branch 'jk/submodule-subdirectory-ok'Junio C Hamano1-1/+1
2013-08-09Merge branch 'sb/mailmap-updates'Junio C Hamano1-2/+7
2013-08-09.mailmap: fixup entriesStefan Beller1-2/+7
2013-08-09t/t7407: fix two typos in submodule testsPhil Hord1-1/+1
2013-08-09parse-options: fix clang opterror() -Wunused-value warningEric Sunshine1-1/+1
2013-08-09l10n: de.po: translate 5 messagesRalf Thielow1-188/+243
2013-08-09l10n: de.po: translate 99 new messagesRalf Thielow1-1638/+1954
2013-08-08Git 1.8.4-rc2v1.8.4-rc2Junio C Hamano2-1/+8
2013-08-08l10n: de.po: switch from pure German to German+EnglishRalf Thielow1-922/+909
2013-08-08l10n: de.po: Fix a typoWieland Hoffmann1-1/+1
2013-08-07fetch: work around "transport-take-over" hackJunio C Hamano3-0/+21
2013-08-07fetch: refactor code that fetches leftover tagsJunio C Hamano1-5/+9
2013-08-07fetch: refactor code that prepares a transportJunio C Hamano1-20/+26
2013-08-07fetch: rename file-scope global "transport" to "gtransport"Junio C Hamano1-11/+11
2013-08-07t5802: add test for connect helperJunio C Hamano1-0/+72
2013-08-07die_with_status: use "printf '%s\n'", not "echo"Matthieu Moy2-1/+14
2013-08-06l10n: Update Swedish translation (2135t0f0u)Peter Krefting1-1521/+1844
2013-08-06l10n: zh_CN.po: translate 5 messages (2135t0f0u)Jiang Xin1-164/+182
2013-08-06l10n: vi.po(2135t): v1.8.4 round 2Tran Ngoc Quan1-169/+187
2013-08-06l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)Jiang Xin1-161/+174
2013-08-05Sync with maint to grab trivial doc fixesJunio C Hamano4-4/+4
2013-08-05Merge branch 'es/blame-L-breakage'Junio C Hamano1-2/+2
2013-08-05t8001, t8002: fix "blame -L :literal" test on NetBSDRené Scharfe1-2/+2
2013-08-05Merge git://github.com/git-l10n/git-poJunio C Hamano3-4352/+5403
2013-08-05Merge branch 'sb/mailmap-updates'Junio C Hamano1-0/+3
2013-08-05Merge branch 'dn/test-reject-utf-16'Junio C Hamano2-2/+2
2013-08-05Merge branch 'bc/commit-invalid-utf8'Junio C Hamano1-1/+1
2013-08-05commit: typofix for xxFFF[EF] checkJunio C Hamano1-1/+1
2013-08-05t3900: test rejecting log message with NULs correctlyJunio C Hamano1-2/+2
2013-08-05Add missing test file for UTF-16.Brian M. Carlson1-0/+0
2013-08-05fix typo in documentation of git-svnFelix Gruber1-1/+1
2013-08-05Documentation/rev-list-options: add missing word in --*-parentsTorstein Hegge1-1/+1
2013-08-05.mailmap: Multiple addresses of Michael S. TsirkinStefan Beller1-0/+3
2013-08-05log: use true parents for diff when walking reflogsThomas Rast2-3/+47
2013-08-05log doc: the argument to --encoding is not optionalJonathan Nieder2-2/+2
2013-08-03l10n: zh_CN.po: translate 99 messages (2133t0f0u)Jiang Xin1-1449/+1851
2013-08-02Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat'Junio C Hamano9-200/+2
2013-08-02Merge branch 'jk/cat-file-batch-optim'Junio C Hamano3-34/+3
2013-08-02Revert "cat-file: split --batch input lines on whitespace"Junio C Hamano3-34/+3
2013-08-01Git 1.8.4-rc1v1.8.4-rc1Junio C Hamano1-1/+1
2013-08-01Merge branch 'ob/typofixes'Junio C Hamano20-23/+23
2013-08-01Merge branch 'ms/subtree-install-fix'Junio C Hamano1-0/+1
2013-08-01Merge branch 'jc/rm-submodule-error-message'Junio C Hamano1-21/+20
2013-08-01Merge branch 'lf/echo-n-is-not-portable'Junio C Hamano3-7/+7
2013-08-01Merge branch 'ma/hg-to-git'Junio C Hamano1-1/+1
2013-08-01Merge branch 'jx/clean-interactive'Junio C Hamano3-31/+91
2013-08-01log: use true parents for diff even when rewritingThomas Rast7-3/+90
2013-07-31Rename advice.object_name_warning to objectNameWarningThomas Rast2-2/+2
2013-07-31Merge branch 'rr/rebase-autostash'Junio C Hamano1-1/+1
2013-07-31Merge branch 'rj/commit-slab-fix'Junio C Hamano1-7/+6
2013-07-31Merge branch 'jk/commit-how-to-abort-cherry-pick'Junio C Hamano1-3/+22
2013-07-31Merge branch 'ds/doc-two-kinds-of-tags'Junio C Hamano1-0/+11
2013-07-31Merge branch 'rr/maint-tilde-markup-in-doc'Junio C Hamano1-12/+14
2013-07-31Merge branch 'mh/packed-refs-do-one-ref-recursion'Junio C Hamano1-1/+5
2013-07-30Merge branch 'jk/capabilities-doc'Junio C Hamano1-4/+36
2013-07-30Merge branch 'sb/mailmap-updates'Junio C Hamano1-0/+4
2013-07-30Merge branch 'bc/completion-for-bash-3.0'Junio C Hamano1-1/+1
2013-07-30contrib/subtree: Fix make install targetMichal Sojka1-0/+1
2013-07-29many small typofixesOndřej Bílka20-23/+23
2013-07-29git-rebase: fix typoRalf Thielow1-1/+1
2013-07-29Avoid using `echo -n` anywhereLukas Fleischer3-7/+7
2013-07-29commit-slab.h: Fix memory allocation and addressingRamsay Jones1-7/+6
2013-07-29commit: tweak empty cherry pick advice for sequencerJeff King1-3/+22
2013-07-29docs/git-tag: explain lightweight versus annotated tagsDaniele Segato1-0/+11
2013-07-27l10n: vi.po (2133t)Tran Ngoc Quan1-1507/+1876
2013-07-26config doc: quote paths, fixing tilde-interpretationRamkumar Ramachandra1-12/+14
2013-07-26document 'allow-tip-sha1-in-want' capabilityNguyễn Thái Ngọc Duy1-0/+7
2013-07-26l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)Jiang Xin1-1396/+1676
2013-07-25builtin/rm.c: consolidate error reporting for removing submodulesJunio C Hamano1-21/+20
2013-07-25commit.h: drop redundant commentJeff King1-2/+0
2013-07-24Git 1.8.4-rc0v1.8.4-rc0Junio C Hamano2-2/+10
2013-07-24Merge branch 'mh/multimail'Junio C Hamano7-4/+3411
2013-07-24Merge branch 'ob/typofixes'Junio C Hamano22-38/+38
2013-07-24Merge branch 'es/contacts'Junio C Hamano2-0/+282
2013-07-24Merge branch 'ml/cygwin-updates'Junio C Hamano1-6/+7
2013-07-24Merge branch 'rj/sparse'Junio C Hamano1-0/+3
2013-07-24Merge branch 'sb/traverse-trees-bitmask-variable-name'Junio C Hamano1-6/+5
2013-07-24Merge branch 'jk/cat-file-batch-optim'Junio C Hamano6-71/+145
2013-07-24Merge branch 'ml/avoid-using-grep-on-crlf-files'Junio C Hamano3-2/+4
2013-07-24Merge branch 'jm/doc-ref-prune'Junio C Hamano2-3/+3
2013-07-24Merge branch 'rh/template-updates'Junio C Hamano1-14/+13
2013-07-24Merge branch 'mh/ref-races-optim-invalidate-cached'Junio C Hamano1-3/+6
2013-07-24Merge branch 'sb/misc-fixes'Junio C Hamano3-5/+2