summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-06-25Git 2.4.5v2.4.5Junio C Hamano4-3/+32
2015-06-25Merge branch 'sg/merge-summary-config' into maintJunio C Hamano3-16/+12
2015-06-25Merge branch 'jk/make-fix-dependencies' into maintJunio C Hamano1-24/+25
2015-06-25Merge branch 'sb/pack-protocol-mention-smart-http' into maintJunio C Hamano1-3/+3
2015-06-25Merge branch 'jk/die-on-bogus-worktree-late' into maintJunio C Hamano2-10/+26
2015-06-25Merge branch 'pt/pull-tags-error-diag' into maintJunio C Hamano1-9/+0
2015-06-25Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano5-22/+23
2015-06-25Merge branch 'jk/diagnose-config-mmap-failure' into maintJunio C Hamano4-11/+29
2015-06-25Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano7-9/+34
2015-06-25Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2-41/+58
2015-06-16Git 2.4.4v2.4.4Junio C Hamano4-3/+39
2015-06-16Merge branch 'jk/clone-dissociate' into maintJunio C Hamano1-13/+4
2015-06-16Merge branch 'sb/submodule-doc-intro' into maintJunio C Hamano1-28/+22
2015-06-16Merge branch 'sb/glossary-submodule' into maintJunio C Hamano1-0/+16
2015-06-16Merge branch 'ah/usage-strings' into maintJunio C Hamano2-2/+2
2015-06-16Merge branch 'mc/commit-doc-grammofix' into maintJunio C Hamano1-1/+1
2015-06-16Merge branch 'rs/janitorial' into maintJunio C Hamano7-26/+9
2015-06-16Merge branch 'sb/test-bitmap-free-at-end' into maintJunio C Hamano1-1/+1
2015-06-16Merge branch 'dt/clean-pathspec-filter-then-lstat' into maintJunio C Hamano1-3/+3
2015-06-16Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano3-29/+139
2015-06-16Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano2-1/+27
2015-06-16Merge branch 'jk/stash-options' into maintJunio C Hamano2-1/+20
2015-06-16Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano2-2/+14
2015-06-16Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maintJunio C Hamano1-1/+53
2015-06-14Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po int...Junio C Hamano1-5/+5
2015-06-12l10n: de.po: translation fix for fall-back to 3way mergeMichael J Gruber1-1/+1
2015-06-12l10n: de.po: punctuation fixesMichael J Gruber1-2/+2
2015-06-12l10n: de.po: grammar fixMichael J Gruber1-1/+1
2015-06-12l10n: de.po: change error message from "sagen" to "Meinten Sie"Phillip Sz1-1/+1
2015-06-05Git 2.4.3v2.4.3Junio C Hamano4-3/+80
2015-06-05Merge branch 'dl/branch-error-message' into maintJunio C Hamano1-3/+3
2015-06-05Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano8-35/+13
2015-06-05Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano3-9/+9
2015-06-05Merge branch 'fg/document-commit-message-stripping' into maintJunio C Hamano1-4/+7
2015-06-05Merge branch 'jk/rerere-forget-check-enabled' into maintJunio C Hamano1-0/+2
2015-06-05Merge branch 'pt/pull-log-n' into maintJunio C Hamano2-2/+19
2015-06-05Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano3-2/+13
2015-06-05Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintJunio C Hamano1-5/+3
2015-06-05Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano1-1/+1
2015-06-05Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano1-3/+3
2015-06-05Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano19-102/+107
2015-06-05Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano1-0/+8
2015-06-05Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano3-33/+112
2015-06-05Merge branch 'mh/ref-directory-file' into maintJunio C Hamano3-118/+312
2015-06-05Merge branch 'mg/log-decorate-HEAD' into maintJunio C Hamano2-11/+22
2015-06-05Merge branch 'sb/t1020-cleanup' into maintJunio C Hamano1-4/+7
2015-06-05Merge branch 'jc/gitignore-precedence' into maintJunio C Hamano2-3/+17
2015-06-05Merge branch 'bc/connect-plink' into maintJunio C Hamano2-22/+67
2015-06-05Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2-0/+63
2015-06-05Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2-1/+9
2015-06-05Merge branch 'mh/clone-verbosity-fix' into maintJunio C Hamano1-2/+2
2015-06-05Merge branch 'jk/sha1-file-reduce-useless-warnings' into maintJunio C Hamano2-6/+2
2015-06-05Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2-3/+16
2015-06-05Merge branch 'jc/plug-fmt-merge-msg-leak' into maintJunio C Hamano1-5/+11
2015-06-05Merge branch 'pt/xdg-config-path' into maintJunio C Hamano10-81/+243
2015-06-02Documentation/technical/pack-protocol: mention http as possible protocolStefan Beller1-3/+3
2015-06-01suppress errors on missing UNINTERESTING linksJeff King1-1/+1
2015-06-01silence broken link warnings with revs->ignore_missing_linksJeff King3-2/+17
2015-06-01add quieter versions of parse_{tree,commit}Jeff King4-6/+16
2015-05-29glossary: add "remote", "submodule", "superproject"Stefan Beller1-0/+16
2015-05-29setup_git_directory: delay core.bare/core.worktree errorsJeff King2-10/+26
2015-05-29Makefile: silence perl/PM.stamp recipeJeff King1-1/+1
2015-05-29Makefile: avoid timestamp updates to GIT-BUILD-OPTIONSJeff King1-21/+22
2015-05-29Makefile: drop dependency between git-instaweb and gitwebJeff King1-1/+1
2015-05-28submodule doc: reorder introductory paragraphsStefan Beller1-28/+22
2015-05-28Documentation: include 'merge.branchdesc' for merge and config as wellSZEDER Gábor3-16/+12
2015-05-28xmmap(): drop "Out of memory?"Junio C Hamano1-1/+1
2015-05-28config.c: rewrite ENODEV into EISDIR when mmap failsJeff King1-0/+2
2015-05-28config.c: avoid xmmap error messagesJeff King3-6/+21
2015-05-28config.c: fix mmap leak when writing configJeff King1-4/+5
2015-05-28read-cache.c: drop PROT_WRITE from mmap of indexJeff King1-1/+1
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King4-20/+20
2015-05-27diff: accept color.diff.context as a synonym for "plain"Jeff King2-2/+3
2015-05-27clone: reorder --dissociate and --reference optionsJeff King1-2/+2
2015-05-27clone: use OPT_STRING_LIST for --referenceJeff King1-11/+2
2015-05-26Git 2.4.2v2.4.2Junio C Hamano4-3/+49
2015-05-26Merge branch 'jk/still-interesting' into maintJunio C Hamano1-4/+19
2015-05-26Merge branch 'jc/hash-object' into maintJunio C Hamano5-9/+43
2015-05-26Merge branch 'jk/rebase-quiet-noop' into maintJunio C Hamano1-1/+1
2015-05-26Merge branch 'sg/complete-decorate-full-not-long' into maintJunio C Hamano1-1/+1
2015-05-26Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2-1/+19
2015-05-26Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maintJunio C Hamano1-1/+1
2015-05-26Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2-7/+16
2015-05-26Merge branch 'jk/git-no-more-argv0-path-munging' into maintJunio C Hamano1-1/+0
2015-05-25Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockJunio C Hamano3-29/+139
2015-05-25Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3Junio C Hamano3-29/+139
2015-05-25http-backend: spool ref negotiation requests to bufferJeff King3-11/+105
2015-05-22test_bitmap_walk: free bitmap with bitmap_freeJeff King1-1/+1
2015-05-22doc: fix inconsistent spelling of "packfile"Patrick Steinhardt2-3/+3
2015-05-22t5407: use <<- to align the expected outputJunio C Hamano1-40/+40
2015-05-22rebase -i: fix post-rewrite hook with failed exec commandMatthieu Moy2-6/+6
2015-05-22rebase -i: demonstrate incorrect behavior of post-rewriteMatthieu Moy1-0/+17
2015-05-20Documentation/log: clarify sha1 non-abbreviation in log --rawMatthieu Moy1-1/+4
2015-05-20dir: remove unused variable sbRené Scharfe1-2/+0
2015-05-20clean: remove unused variable bufRené Scharfe1-2/+0
2015-05-20use file_exists() to check if a file exists in the worktreeRené Scharfe5-22/+9
2015-05-20stash: recognize "--help" for subcommandsJeff King1-0/+11
2015-05-20stash: complain about unknown flagsJeff King2-1/+9
2015-05-20t5551: factor out tag creationJeff King1-13/+21
2015-05-19Documentation/git-commit: grammofixMichael Coleman1-1/+1
2015-05-19pack-bitmaps: plug memory leak, fix allocation size for recent_bitmapsRené Scharfe1-5/+3
2015-05-19clone: call transport_set_verbosity before anything else on the newly created...Mike Hommey1-2/+2
2015-05-18subdirectory tests: code cleanup, uncomment testStefan Beller1-4/+7
2015-05-18clean: only lstat files in pathspecDavid Turner1-3/+3
2015-05-18Documentation/log: clarify what --raw meansMatthieu Moy1-1/+10
2015-05-18pull: parse pull.ff as a bool or stringPaul Tan1-1/+1
2015-05-18pull: make pull.ff=true override merge.ffPaul Tan3-1/+12
2015-05-18pull: handle --log=<n>Paul Tan2-2/+19
2015-05-18sha1_file: pass empty buffer to index empty fileJim Hill2-1/+27
2015-05-17pack-protocol.txt: fix insconsistent spelling of "packfile"Patrick Steinhardt1-3/+3
2015-05-17git-unpack-objects.txt: fix inconsistent spelling of "packfile"Patrick Steinhardt1-2/+2
2015-05-17git-verify-pack.txt: fix inconsistent spelling of "packfile"Patrick Steinhardt1-1/+1
2015-05-15http-backend: fix die recursion with custom handlerJeff King1-5/+9
2015-05-14rerere: exit silently on "forget" when rerere is disabledJeff King1-0/+2
2015-05-14pull: remove --tags error in no merge candidates casePaul Tan1-9/+0
2015-05-14doc: convert AsciiDoc {?foo} to ifdef::foo[]Jeff King1-2/+6
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-13log: do not shorten decoration names too earlyJunio C Hamano1-18/+16
2015-05-13log: decorate HEAD with branch name under --decorate=full, tooJunio C Hamano2-6/+19
2015-05-12doc: put example URLs and emails inside literal backticksJeff King3-5/+5
2015-05-12doc: drop backslash quoting of some curly bracesJeff King1-7/+7
2015-05-12doc: convert \--option to --optionJeff King11-80/+80
2015-05-12doc/add: reformat `--edit` optionJeff King1-1/+2
2015-05-12doc: fix length of underlined section-titleJeff King1-1/+1
2015-05-12doc: fix hanging "+"-continuationJeff King1-3/+3
2015-05-12doc: fix unquoted use of "{type}"Jeff King1-1/+1
2015-05-12doc: fix misrendering due to `single quote'Jeff King2-2/+2
2015-05-12doc: fix unmatched code fences in git-stripspaceJeff King1-3/+3
2015-05-12Merge branch 'mh/write-refs-sooner-2.3' into mh/write-refs-sooner-2.4Junio C Hamano0-0/+0
2015-05-12ref_transaction_commit(): fix atomicity and avoid fd exhaustionMichael Haggerty2-23/+55
2015-05-12ref_transaction_commit(): remove the local flags variableMichael Haggerty1-9/+9
2015-05-12ref_transaction_commit(): inline call to write_ref_sha1()Michael Haggerty1-18/+7
2015-05-12rename_ref(): inline calls to write_ref_sha1() from this functionMichael Haggerty1-4/+8
2015-05-12commit_ref_update(): new function, extracted from write_ref_sha1()Michael Haggerty1-7/+20
2015-05-12write_ref_to_lockfile(): new function, extracted from write_ref_sha1()Michael Haggerty1-4/+17
2015-05-12t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZEStefan Beller1-2/+2
2015-05-12update-ref: test handling large transactions properlyStefan Beller1-0/+28
2015-05-12Merge branch 'mh/write-refs-sooner-2.2' into mh/write-refs-sooner-2.3Junio C Hamano3-28/+103
2015-05-12ref_transaction_commit(): fix atomicity and avoid fd exhaustionMichael Haggerty2-12/+47
2015-05-12ref_transaction_commit(): remove the local flags variableMichael Haggerty1-4/+3
2015-05-12ref_transaction_commit(): inline call to write_ref_sha1()Michael Haggerty1-28/+10
2015-05-12rename_ref(): inline calls to write_ref_sha1() from this functionMichael Haggerty1-4/+8
2015-05-12commit_ref_update(): new function, extracted from write_ref_sha1()Michael Haggerty1-16/+29
2015-05-12write_ref_to_lockfile(): new function, extracted from write_ref_sha1()Michael Haggerty1-12/+26
2015-05-12t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZEStefan Beller1-2/+2
2015-05-12add: check return value of launch_editorJeff King2-1/+9
2015-05-12doc: fix unmatched code fencesJean-Noel Avila1-1/+1
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-05-11reflog_expire(): integrate lock_ref_sha1_basic() errors into oursMichael Haggerty1-2/+2
2015-05-11ref_transaction_commit(): delete extra "the" from error messageMichael Haggerty2-8/+8
2015-05-11ref_transaction_commit(): provide better error messagesMichael Haggerty1-4/+6
2015-05-11rename_ref(): integrate lock_ref_sha1_basic() errors into oursMichael Haggerty1-4/+2
2015-05-11lock_ref_sha1_basic(): improve diagnostics for ref D/F conflictsMichael Haggerty2-8/+16
2015-05-11lock_ref_sha1_basic(): report errors via a "struct strbuf *err"Michael Haggerty1-16/+28
2015-05-11verify_refname_available(): report errors via a "struct strbuf *err"Michael Haggerty1-20/+30
2015-05-11verify_refname_available(): rename functionMichael Haggerty1-17/+20
2015-05-11refs: check for D/F conflicts among refs created in a transactionMichael Haggerty2-63/+95
2015-05-11ref_transaction_commit(): use a string_list for detecting duplicatesMichael Haggerty1-14/+11
2015-05-11is_refname_available(): use dirname in first loopMichael Haggerty1-14/+26
2015-05-11struct nonmatching_ref_data: store a refname instead of a ref_entryMichael Haggerty1-3/+4
2015-05-11report_refname_conflict(): inline functionMichael Haggerty1-8/+2
2015-05-11entry_matches(): inline functionMichael Haggerty1-7/+2
2015-05-11is_refname_available(): convert local variable "dirname" to strbufMichael Haggerty1-7/+5
2015-05-11is_refname_available(): avoid shadowing "dir" variableMichael Haggerty1-2/+2
2015-05-11is_refname_available(): revamp the commentsMichael Haggerty1-22/+47
2015-05-11t1404: new tests of ref D/F conflicts within transactionsMichael Haggerty1-0/+107
2015-05-10update-ref: test handling large transactions properlyStefan Beller1-0/+28
2015-05-08bundle: verify arguments more strictlyPatrick Steinhardt1-0/+8
2015-05-07tests: skip dav http-push tests under NO_EXPAT=NoThanksJunio C Hamano2-0/+7
2015-05-07t/lib-httpd.sh: skip tests if NO_CURL is definedJeff King7-35/+6
2015-05-06branch: do not call a "remote-tracking branch" a "remote branch"Danny Lin1-3/+3
2015-05-06path.c: remove home_config_paths()Paul Tan2-29/+0
2015-05-06git-config: replace use of home_config_paths()Paul Tan2-8/+4
2015-05-06git-commit: replace use of home_config_paths()Paul Tan1-5/+3
2015-05-06credential-store.c: replace home_config_paths() with xdg_config_home()Paul Tan1-1/+1
2015-05-06dir.c: replace home_config_paths() with xdg_config_home()Paul Tan1-5/+2
2015-05-06attr.c: replace home_config_paths() with xdg_config_home()Paul Tan1-5/+2
2015-05-06path.c: implement xdg_config_home()Paul Tan2-0/+22
2015-05-05git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deri...Elia Pinto1-1/+53
2015-05-05daemon: unbreak NO_IPV6 build regressionJunio C Hamano1-1/+1
2015-05-05write_sha1_file(): do not use a separate sha1[] arrayJunio C Hamano1-4/+1
2015-05-05t1007: add hash-object --literally testsEric Sunshine1-0/+11
2015-05-05hash-object --literally: fix buffer overrun with extra-long object typeEric Sunshine3-3/+23
2015-05-04git-hash-object.txt: document --literally optionEric Sunshine1-2/+8
2015-05-03blame, log: format usage strings similarly to those in documentationAlex Henrie2-2/+2
2015-05-03completion: fix and update 'git log --decorate=' optionsSZEDER Gábor1-1/+1
2015-05-03blame: CRLF in the working tree and LF in the repoTorsten Bögershausen2-3/+16
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-18 14:07:23 +0000