Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'jk/checkout-out-of-unborn' * jk/checkout-out-of-unborn: checkout: print a message when switching unborn branches
Junio C Hamano
Merge branch 'cn/config-missing-path' "git config --path $key" segfaulted on "[section] key" (a boolean "true" spelled without "=", not "[section] key = true"). * cn/config-missing-path: config: don't segfault when given --path with a missing value
Junio C Hamano
Merge branch 'jl/submodule-rm' * jl/submodule-rm: docs: move submodule section
Junio C Hamano
Merge branch 'mg/replace-resolve-delete' Be more user friendly to people using "git replace -d". * mg/replace-resolve-delete: replace: parse revision argument for -d
Junio C Hamano
Merge branch 'jk/maint-gitweb-xss' Fixes an XSS vulnerability in gitweb. * jk/maint-gitweb-xss: gitweb: escape html in rss title
Junio C Hamano
Merge branch 'rh/maint-gitweb-highlight-ext' Fixes a clever misuse of perl's list interpretation. * rh/maint-gitweb-highlight-ext: gitweb.perl: fix %highlight_ext mappings
Junio C Hamano
Merge branch 'pw/maint-p4-rcs-expansion-newline' I do not have p4 to play with, but looks obviously correct to me. * pw/maint-p4-rcs-expansion-newline: git p4: RCS expansion should not span newlines
Junio C Hamano
Merge branch 'mh/alt-odb-string-list-cleanup' Cleanups in the alternates code. Fixes a potential bug and makes the code much cleaner. * mh/alt-odb-string-list-cleanup: link_alt_odb_entries(): take (char *, len) rather than two pointers link_alt_odb_entries(): use string_list_split_in_place()
Junio C Hamano
Merge branch 'ta/doc-cleanup' * ta/doc-cleanup: Documentation: build html for all files in technical and howto Documentation/howto: convert plain text files to asciidoc Documentation/technical: convert plain text files to asciidoc Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some …
Junio C Hamano
Merge branch 'kb/preload-index-more' Use preloadindex in more places, which has a nice speedup on systems with slow stat calls (and even on Linux). * kb/preload-index-more: update-index/diff-index: use core.preloadindex to improve performance
Junio C Hamano
Merge branch 'jk/maint-http-half-auth-fetch' Fixes fetch from servers that ask for auth only during the actual packing phase. This is not really a recommended configuration, but it cleans up the code at the same time. * jk/maint-http-half-auth-fetch: remote-curl: retry failed requests for auth even with gzip remote-curl: hoist gzip buffer size to top of post_rpc
Junio C Hamano
Sync with maint * maint: Further preparation for 1.8.0.1
Junio C Hamano
Further preparation for 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'mg/maint-pull-suggest-upstream-to' into maint * mg/maint-pull-suggest-upstream-to: push/pull: adjust missing upstream help text to changed interface
Junio C Hamano
Merge branch 'mm/maint-doc-commit-edit' into maint * mm/maint-doc-commit-edit: Document 'git commit --no-edit' explicitly
Junio C Hamano
Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint * as/maint-doc-fix-no-post-rewrite: commit: fixup misplacement of --no-post-rewrite description
Junio C Hamano
Merge branch 'rs/lock-correct-ref-during-delete' into maint * rs/lock-correct-ref-during-delete: refs: lock symref that is to be deleted, not its target
Junio C Hamano
Merge branch 'rf/maint-mailmap-off-by-one' into maint * rf/maint-mailmap-off-by-one: mailmap: avoid out-of-bounds memory access
Junio C Hamano
Merge branch 'jk/maint-diff-grep-textconv' into maint "git diff -G<pattern>" did not honor textconv filter when looking for changes. * jk/maint-diff-grep-textconv: diff_grep: use textconv buffers for add/deleted files
Junio C Hamano
Merge branch 'js/format-2047' into maint Various rfc2047 quoting issues around a non-ASCII name on the From: line in the output from format-patch have been corrected. * js/format-2047: format-patch tests: check quoting/encoding in To: and Cc: headers format-patch: fix rfc2047 address encoding with respect to rfc822 specials format-patch: make rfc2047 encoding more strict format-patch: introduce helper function last_line_length()…
Felipe Contreras
completion: start moving to the new zsh completion Zsh's bash completion emulation is buggy, not properly maintained, and we have some workarounds in place for different bugs that appeared in various versions. Since I'm the only one that has worked on that code lately[1], it might make snese to use the code I wrote specifically for git. The advantages are: 1) Less workarounds * No need to hack __get_comp_words_by_ref * No need to hack I…
Felipe Contreras
completion: add new zsh completion It seems there's always issues with zsh's bash completion emulation. I've tried to fix as many as I could[1], and most of the fixes are already in the latest version of zsh, but still, there are issues. There is no point going through all that pain; the emulation is easy to achieve, and this patch works better than zsh's bash completion emulation. [1] http://zsh.git.sourceforge.net/git/gitweb.cg…
Mark Levedahl
USE CGYWIN_V15_WIN32API as macro to select api for cygwin The previous macro was confusing to some, and did not include "cygwin" in its name. The updated name more clearly expresses a choice of the win32api implementation that shipped with version 1.5 of cygwin. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Sync with maint
Junio C Hamano
Start preparing for 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'sz/maint-curl-multi-timeout' into maint Sometimes curl_multi_timeout() function suggested a wrong timeout value when there is no file descriptors to wait on and the http transport ended up sleeping for minutes in select(2) system call. A workaround has been added for this. * sz/maint-curl-multi-timeout: Fix potential hang in https handshake
Junio C Hamano
Merge branch 'po/maint-refs-replace-docs' into maint The refs/replace hierarchy was not mentioned in the repository-layout docs. * po/maint-refs-replace-docs: Doc repository-layout: Show refs/replace
Junio C Hamano
Merge branch 'ph/pull-rebase-detached' into maint "git pull --rebase" run while the HEAD is detached tried to find the upstream branch of the detached HEAD (which by definition does not exist) and emitted unnecessary error messages. * ph/pull-rebase-detached: git-pull: Avoid merge-base on detached head
Junio C Hamano
Merge branch 'mm/maint-doc-remote-tracking' into maint Update "remote tracking branch" in the documentation to "remote-tracking branch". * mm/maint-doc-remote-tracking: Documentation: remote tracking branch -> remote-tracking branch
Junio C Hamano
Merge branch 'rs/branch-del-symref' into maint A symbolic ref refs/heads/SYM was not correctly removed with "git branch -d SYM"; the command removed the ref pointed by SYM instead. * rs/branch-del-symref: branch: show targets of deleted symrefs, not sha1s branch: skip commit checks when deleting symref branches branch: delete symref branch, not its target branch: factor out delete_branch_config() branch: factor out check_branch_comm…
  1. Prev
  2. Next