summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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-22doc: fix inconsistent spelling of "packfile"Patrick Steinhardt2-3/+3
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-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-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-14rerere: exit silently on "forget" when rerere is disabledJeff King1-0/+2
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-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-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
2015-04-30Git 2.4v2.4.0Junio C Hamano2-1/+6
2015-04-29filter-branch: avoid passing commit message through sedJeff King2-1/+19
2015-04-29rebase -i: redo tasks that die during cherry-pickPhil Hord2-0/+63
2015-04-28connect: improve check for plink to reduce false positivesbrian m. carlson2-3/+48
2015-04-28t5601: fix quotation error leading to skipped testsbrian m. carlson1-1/+1
2015-04-28connect: simplify SSH connection code pathbrian m. carlson1-20/+20
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-28rebase: silence "git checkout" for noop rebaseJeff King1-1/+1
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-27Documentation: clarify how "git commit" cleans up the edited log messageFredrik Gustafsson1-4/+7
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-22ignore: info/exclude should trump core.excludesfileJunio C Hamano2-3/+17
2015-04-22Git 2.4.0-rc3v2.4.0-rc3Junio C Hamano1-1/+1
2015-04-22stop putting argv[0] dirname at front of PATHJeff King1-1/+0
2015-04-22stash: require a clean index to applyJeff King2-0/+9
2015-04-22t3903: avoid applying onto dirty indexJeff King1-2/+2
2015-04-22t3903: stop hard-coding commit sha1sJeff King1-5/+5
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-20fmt-merge-msg: plug small leak of commit bufferJunio C Hamano1-5/+11
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-17limit_list: avoid quadratic behavior from still_interestingJeff King1-4/+19
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
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-27 05:33:39 +0000