summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-12-17Git 1.8.5.2v1.8.5.2Junio C Hamano4-3/+24
2013-12-17Merge branch 'rs/doc-submitting-patches' into maintJunio C Hamano1-2/+9
2013-12-17Merge branch 'tr/doc-git-cherry' into maintJunio C Hamano1-33/+110
2013-12-17Merge branch 'nd/glossary-content-pathspec-markup' into maintJunio C Hamano1-3/+3
2013-12-17Merge branch 'jj/doc-markup-gitcli' into maintJunio C Hamano1-5/+5
2013-12-17Merge branch 'jj/doc-markup-hints-in-coding-guidelines' into maintJunio C Hamano1-3/+31
2013-12-17Merge branch 'jj/log-doc' into maintJunio C Hamano1-26/+25
2013-12-17Merge branch 'jj/rev-list-options-doc' into maintJunio C Hamano1-156/+87
2013-12-17Merge branch 'tb/doc-fetch-pack-url' into maintJunio C Hamano1-8/+7
2013-12-17Merge branch 'mi/typofixes' into maintJunio C Hamano8-10/+10
2013-12-17Merge branch 'jh/loose-object-dirs-creation-race' into maintJunio C Hamano1-1/+3
2013-12-17Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano3-97/+121
2013-12-17Merge branch 'sb/sha1-loose-object-info-check-existence' into maintJunio C Hamano2-6/+15
2013-12-17Merge branch 'nd/magic-pathspec' into maintJunio C Hamano2-10/+13
2013-12-17cmd_repack(): remove redundant local variable "nr_packs"Michael Haggerty1-4/+2
2013-12-03Git 1.8.5.1v1.8.5.1Junio C Hamano4-3/+13
2013-12-03ref-iteration doc: add_submodule_odb() returns 0 for successNick Townsend1-2/+2
2013-12-02Sync with 1.8.4.5Junio C Hamano4-6/+45
2013-12-02Git 1.8.4.5v1.8.4.5Junio C Hamano4-3/+17
2013-12-02submodule: do not copy unknown update mode from .gitmodulesJunio C Hamano2-5/+30
2013-11-27Documentation: revamp git-cherry(1)Thomas Rast1-33/+110
2013-11-27Git 1.8.5v1.8.5Junio C Hamano2-1/+6
2013-11-27Sync with maintJunio C Hamano0-0/+0
2013-11-27remote-hg: don't decode UTF-8 paths into Unicode objectsRichard Hansen1-1/+1
2013-11-27SubmittingPatches: document how to handle multiple patchesRené Scharfe1-2/+9
2013-11-25Merge branch 'rh/remote-hg-bzr-updates' (early part)Junio C Hamano1-1/+1
2013-11-21glossary-content.txt: fix documentation of "**" patternsNguyễn Thái Ngọc Duy1-3/+3
2013-11-20Documentation/gitcli.txt: fix double quotesJason St. John1-5/+5
2013-11-20diff: restrict pathspec limitations to diff b/f case onlyNguyễn Thái Ngọc Duy2-10/+13
2013-11-20Git 1.8.5-rc3v1.8.5-rc3Junio C Hamano1-1/+1
2013-11-20Sync with 1.8.4.4Junio C Hamano2-1/+12
2013-11-20Git 1.8.4.4v1.8.4.4Junio C Hamano3-2/+13
2013-11-20Merge branch 'mb/relnotes-1.8.5-fix'Junio C Hamano1-82/+84
2013-11-18RelNotes: spelling & grammar fixesMarc Branchaud1-82/+84
2013-11-18Merge branch 'nd/literal-pathspecs'Junio C Hamano6-5/+30
2013-11-18remote-hg: don't decode UTF-8 paths into Unicode objectsRichard Hansen1-1/+1
2013-11-18Documentation/rev-list-options.txt: fix some grammatical issues and typosJason St. John1-13/+14
2013-11-18Documentation/rev-list-options.txt: fix mark-upJason St. John1-148/+78
2013-11-18State correct usage of literal examples in man pages in the coding standardsJason St. John1-3/+31
2013-11-18Merge branch 'maint'Junio C Hamano1-1/+0
2013-11-18Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2-12/+20
2013-11-18branch: fix --verbose output column alignmentTorstein Hegge2-12/+20
2013-11-18Revert "upload-pack: send non-HEAD symbolic refs"Junio C Hamano1-1/+0
2013-11-13Documentation/git-log.txt: mark-up fix and minor rephasingJason St. John1-23/+23
2013-11-13Documentation/git-log: update "--log-size" descriptionJason St. John1-5/+5
2013-11-13Git 1.8.5-rc2v1.8.5-rc2Junio C Hamano1-1/+1
2013-11-12Merge git://github.com/git-l10n/git-poJunio C Hamano7-7412/+9045
2013-11-12Correct word usage of "timezone" in "Documentation" directoryJason St. John7-22/+22
2013-11-12contrib: typofixesMasanari Iida4-4/+4
2013-11-12Documentation/technical/http-protocol.txt: typofixesMasanari Iida1-2/+2
2013-11-12typofixes: fix misspelt commentsMasanari Iida3-4/+4
2013-11-12l10n: de.po: improve error message when pushing to unknown upstreamRalf Thielow1-1/+1
2013-11-12l10n: de.po: translate 68 new messagesRalf Thielow1-1216/+1498
2013-11-12po/TEAMS: update Thomas Rast's email addressRalf Thielow1-1/+1
2013-11-11git-fetch-pack uses URLs like git-fetchTorsten Bögershausen1-8/+7
2013-11-10Merge remote-tracking branch 'sv/nafmo/master'Jiang Xin1-1217/+1499
2013-11-09l10n: Update Swedish translation (2194t0f0u)Peter Krefting1-1217/+1499
2013-11-08l10n: fr.po 2194/1294 messages translatedJean-Noel Avila1-1230/+1513
2013-11-08Sync with 1.8.4.3Junio C Hamano2-1/+20
2013-11-08Git 1.8.4.3v1.8.4.3Junio C Hamano3-2/+21
2013-11-08Merge branch 'jn/test-prereq-perl-doc' into maintJunio C Hamano1-4/+11
2013-11-08Merge branch 'ap/remote-hg-unquote-cquote' into maintJunio C Hamano1-0/+6
2013-11-08Merge branch 'jc/upload-pack-send-symref' into maintJunio C Hamano6-20/+124
2013-11-08Merge branch 'jk/http-auth-redirects' into maintJunio C Hamano7-65/+191
2013-11-07Sync with maintJunio C Hamano2-3/+39
2013-11-07Start preparing for 1.8.4.3Junio C Hamano2-1/+37
2013-11-07Merge branch 'sc/doc-howto-dumb-http' into maintJunio C Hamano1-0/+4
2013-11-07Merge branch 'vd/doc-unpack-objects' into maintJunio C Hamano1-1/+1
2013-11-07Merge branch 'jk/subtree-install-fix' into maintJunio C Hamano1-1/+6
2013-11-07Merge branch 'hn/log-graph-color-octopus' into maintJunio C Hamano1-2/+2
2013-11-07Merge branch 'mm/checkout-auto-track-fix' into maintJunio C Hamano3-28/+98
2013-11-07Merge branch 'sg/prompt-svn-remote-fix' into maintJunio C Hamano1-1/+1
2013-11-07Merge branch 'jk/split-broken-ident' into maintJunio C Hamano2-3/+22
2013-11-07Merge branch 'jc/revision-range-unpeel' into maintJunio C Hamano2-22/+45
2013-11-07gitignore.txt: fix documentation of "**" patternsKarsten Blees1-3/+3
2013-11-06Git 1.8.5-rc1v1.8.5-rc1Junio C Hamano1-1/+1
2013-11-06Merge branch 'fc/trivial'Junio C Hamano16-41/+30
2013-11-06sha1_loose_object_info(): do not return success on missing objectJunio C Hamano2-6/+15
2013-11-04Update draft release notes to 1.8.5Junio C Hamano1-0/+17
2013-11-04Merge branch 'bw/solaris-sed-tr-test-portability'Junio C Hamano2-14/+21
2013-11-04Merge branch 'vd/doc-unpack-objects'Junio C Hamano1-1/+1
2013-11-04Merge branch 'jk/duplicate-objects-in-packs'Junio C Hamano1-4/+4
2013-11-04Merge branch 'jk/subtree-install-fix'Junio C Hamano1-1/+6
2013-11-04Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'Junio C Hamano1-5/+5
2013-11-04Merge branch 'jk/wrap-perl-used-in-tests'Junio C Hamano29-54/+62
2013-11-04Merge branch 'sc/doc-howto-dumb-http'Junio C Hamano1-0/+4
2013-11-04Merge branch 'jn/test-prereq-perl-doc'Junio C Hamano1-4/+11
2013-11-04t1005: add test for "read-tree --reset -u A B"Junio C Hamano1-0/+15
2013-11-04t1005: reindentJunio C Hamano2-89/+89
2013-11-04unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJeff King1-8/+17
2013-11-04t4015: simplify sed command that is not even seen by sedJunio C Hamano1-1/+0
2013-11-03l10n: zh_CN.po: translate 68 messages (2194t0f0u)Jiang Xin1-1270/+1508
2013-11-02l10n: vi.po (2194t): Update and minor fixTran Ngoc Quan1-1276/+1562
2013-11-02l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)Jiang Xin1-1201/+1463
2013-11-01Documentation: "pack-file" is not literal in unpack-objectsVivien Didelot1-1/+1
2013-11-01Update draft release notes to 1.8.5Junio C Hamano1-6/+19
2013-11-01Merge branch 'sb/refs-code-cleanup'Junio C Hamano4-21/+0
2013-11-01Merge branch 'rs/web-browse-xdg-open'Junio C Hamano2-3/+4
2013-11-01Merge branch 'js/tests-windows-port-fix'Junio C Hamano6-14/+72
2013-11-01Merge branch 'js/test-help-format-windows-port-fix'Junio C Hamano1-1/+1
2013-11-01Merge branch 'jk/reset-p-current-head-fix'Junio C Hamano4-16/+23
2013-11-01Merge branch 'jk/pack-corruption-post-mortem'Junio C Hamano2-0/+243
2013-11-01Merge branch 'jk/for-each-ref-skip-parsing'Junio C Hamano2-9/+24
2013-11-01Merge branch 'ap/remote-hg-unquote-cquote'Junio C Hamano1-0/+6
2013-11-01Merge branch 'jl/submodule-mv'Junio C Hamano2-4/+35
2013-10-31Documentation: restore a space in unpack-objects usageVivien Didelot1-1/+1
2013-10-31setup: trivial style fixesFelipe Contreras1-2/+2
2013-10-31run-command: trivial style fixesFelipe Contreras1-8/+5
2013-10-31diff: trivial style fixFelipe Contreras1-1/+1
2013-10-31revision: trivial style fixesFelipe Contreras1-8/+6
2013-10-31pretty: trivial style fixFelipe Contreras1-1/+1
2013-10-31describe: trivial style fixesFelipe Contreras1-4/+3
2013-10-31transport-helper: trivial style fixFelipe Contreras1-0/+1
2013-10-31sha1-name: trivial style cleanupFelipe Contreras1-1/+0
2013-10-31branch: trivial style fixFelipe Contreras1-2/+1
2013-10-31revision: add missing includeFelipe Contreras1-0/+1
2013-10-31doc/pull: clarify the illustrationsJunio C Hamano1-1/+3
2013-10-31t: replace pulls with mergesFelipe Contreras4-4/+4
2013-10-31merge: simplify ff-only optionFelipe Contreras1-9/+2
2013-10-31Fix '\%o' for printf from coreutilsKacper Kornet1-4/+4
2013-10-30web--browse: Add support for xdg-openRüdiger Sonderfeld2-3/+4
2013-10-30t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is htmlJohannes Sixt1-1/+1
2013-10-30Git 1.8.5-rc0v1.8.5-rc0Junio C Hamano2-1/+24
2013-10-30Merge branch 'maint'Junio C Hamano0-0/+0
2013-10-30Merge branch 'jk/refs-c-squelch-gcc'Junio C Hamano1-1/+1
2013-10-30Merge branch 'jk/date-c-double-semicolon'Junio C Hamano1-1/+1
2013-10-30Merge branch 'nd/lift-path-max'Junio C Hamano3-6/+18
2013-10-30Merge branch 'tr/valgrind-test-fix'Junio C Hamano1-99/+34
2013-10-30Merge branch 'tr/gitk-doc-update'Junio C Hamano1-24/+83
2013-10-30Merge branch 'jl/pack-transfer-avoid-double-close'Junio C Hamano2-0/+8
2013-10-30Merge branch 'sb/git-svn-docs-indent-with-ht'Junio C Hamano1-13/+13
2013-10-30Merge branch 'nd/magic-pathspec'Junio C Hamano3-2/+19
2013-10-30Merge branch 'nd/gc-lock-against-each-other'Junio C Hamano2-0/+29
2013-10-30Merge branch 'hn/log-graph-color-octopus'Junio C Hamano1-2/+2
2013-10-30Merge branch 'mm/checkout-auto-track-fix'Junio C Hamano3-28/+98
2013-10-30Merge branch 'sg/t3600-nul-sha1-fix'Junio C Hamano1-7/+4
2013-10-30Merge branch 'fc/styles'Junio C Hamano11-18/+19
2013-10-30Merge branch 'jc/upload-pack-send-symref'Junio C Hamano6-22/+125
2013-10-30Merge branch 'jk/http-auth-redirects'Junio C Hamano7-65/+191
2013-10-30subtree: add makefile target for html docsJeff King1-1/+6
2013-10-30t5570: Update for clone-progress-to-stderr branchBrian Gernhardt1-2/+1
2013-10-30Avoid difference in tr semantics between System V and BSDBen Walton1-12/+18
2013-10-30for-each-ref: avoid loading objects to print %(objectname)Jeff King2-9/+24
2013-10-30cvsserver: Determinize output to combat Perl 5.18 hash randomizationAnders Kaseorg1-5/+5
2013-10-29t: use perl instead of "$PERL_PATH" where applicableJeff King28-50/+50
2013-10-29t: provide a perl() function which uses $PERL_PATHJeff King2-4/+12
2013-10-28doc/howto: warn about (dumb)http server document being too oldSitaram Chamarty1-0/+4
2013-10-28t/README: tests can use perl even with NO_PERLJonathan Nieder1-4/+11
2013-10-28Almost -rc0 for 1.8.5Junio C Hamano1-0/+15
2013-10-28Sync with v1.8.4.2Junio C Hamano4-3/+18
2013-10-28Merge branch 'sb/repack-in-c'Junio C Hamano1-1/+1
2013-10-28Merge branch 'sg/prompt-svn-remote-fix'Junio C Hamano1-1/+1
2013-10-28Merge branch 'jk/split-broken-ident'Junio C Hamano2-3/+22
2013-10-28Merge branch 'jk/remote-literal-string-leakfix'Junio C Hamano1-1/+1
2013-10-28Merge branch 'ew/keepalive'Junio C Hamano1-0/+38
2013-10-28Merge branch 'jc/revision-range-unpeel'Junio C Hamano2-22/+45
2013-10-28Merge branch 'jx/relative-path-regression-fix'Junio C Hamano4-32/+99
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-28pathspec: stop --*-pathspecs impact on internal parse_pathspec() usesNguyễn Thái Ngọc Duy6-4/+30
2013-10-28sha1_file.c:create_tmpfile(): Fix race when creating loose object dirsJohan Herland1-1/+3
2013-10-28Change sed i\ usage to something Solaris' sed can handleBen Walton1-2/+4
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-28tests: undo special treatment of CRLF for WindowsJohannes Sixt3-9/+0
2013-10-28Windows: a test_cmp that is agnostic to random LF <> CRLF conversionsJohannes Sixt2-0/+67
2013-10-28t5300-pack-object: do not compare binary data using test_cmpJohannes Sixt1-5/+5
2013-10-28cache: remove unused function 'have_git_dir'Stefan Beller2-6/+0
2013-10-28refs: remove unused function invalidate_ref_cacheStefan Beller2-15/+0
2013-10-25howto: add article on recovering a corrupted objectJeff King2-0/+243
2013-10-25reset: pass real rev name to add--interactiveJeff King3-7/+10
2013-10-25add-interactive: handle unborn branch in patch modeJeff King1-9/+13
2013-10-24silence gcc array-bounds warningJeff King1-1/+1
2013-10-24drop redundant semicolon in empty whileJeff King1-1/+1
2013-10-24checkout_entry(): clarify the use of topath[] parameterJunio C Hamano3-1/+10
2013-10-24entry.c: convert checkout_entry to use strbufNguyễn Thái Ngọc Duy1-5/+8
2013-10-24http.c: Spell the null pointer as NULLRamsay Jones1-1/+1
2013-10-23Update draft release notes to 1.8.5Junio C Hamano1-0/+4
2013-10-23Sync with 'maint'Junio C Hamano1-0/+13
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-23Merge branch 'bc/gnome-keyring'Junio C Hamano2-134/+167
2013-10-23Merge branch 'po/dot-url'Junio C Hamano2-2/+8
2013-10-23Merge branch 'jc/prompt-upstream'Junio C Hamano1-1/+6
2013-10-23Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano2-2/+14
2013-10-23Merge branch 'mg/more-textconv'Junio C Hamano14-57/+237
2013-10-23Merge branch 'jc/pack-objects'Junio C Hamano1-11/+12
2013-10-23remote-hg: unquote C-style paths when exportingAntoine Pelisse1-0/+6
2013-10-23Clear fd after closing to avoid double-close errorJens Lindstrom2-0/+8
2013-10-22Revert "test-lib: allow prefixing a custom string before "ok N" etc."Thomas Rast1-15/+12
2013-10-22Revert "test-lib: support running tests under valgrind in parallel"Thomas Rast1-84/+22
2013-10-22git-svn docs: Use tabs consistently within the ascii docStefan Beller1-13/+13
2013-10-22t5570: Update for clone-progress-to-stderr branchBrian Gernhardt1-2/+1
2013-10-22Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symrefJunio C Hamano4-28/+32
2013-10-22t5570: Update for symref capabilityBrian Gernhardt1-1/+1