1. Stefan Saasen
  2. git

Commits

Author Commit Message Date Builds
Jiang Xin
Fix typo in git-gc document. The variable gc.packrefs for git-gc can be set to true, false and "notbare", not "nobare". Signed-off-by: Jiang Xin <jiangxin@ossxp.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes to 1.7.4 We are getting closer to -rc0 ;-) Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: difftool: provide basename to external tools git-difftool.txt: correct the description of $BASE and describe $MERGED
Nguyễn Thái Ngọc Duy
get_sha1: handle special case $commit^{/} Empty regex pattern should always match. But the exact behavior of regexec() may vary. Because it always matches anyway, we can just return 'matched' without calling regex machinery. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
difftool: provide basename to external tools Currently, only configured diff helpers get the basename of the file being compared. Tools specified with "git difftool -x" only get the names of temporary files for the different versions. Export BASE so that an external tool can read the name from the environment. Rather than using a third argument, this avoids breaking existing scripts which may somewhat carelessly be using "$@" rather than "$…
Michael J Gruber
git-difftool.txt: correct the description of $BASE and describe $MERGED Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'kb/diff-C-M-synonym' * kb/diff-C-M-synonym: diff: use "find" instead of "detect" as prefix for long forms of -M and -C diff: add --detect-copies-harder as a synonym for --find-copies-harder
Junio C Hamano
Merge branch 'jn/fast-import-blob-access' * jn/fast-import-blob-access: t9300: avoid short reads from dd t9300: remove unnecessary use of /dev/stdin fast-import: Allow cat-blob requests at arbitrary points in stream fast-import: let importers retrieve blobs fast-import: clarify documentation of "feature" command fast-import: stricter parsing of integer options Conflicts: fast-import.c
Junio C Hamano
Merge branch 'jl/fetch-submodule-recursive' * jl/fetch-submodule-recursive: fetch_populated_submodules(): document dynamic allocation Submodules: Add the "fetchRecurseSubmodules" config option Add the 'fetch.recurseSubmodules' config setting fetch/pull: Add the --recurse-submodules option Conflicts: builtin/fetch.c
Junio C Hamano
Merge branch 'rj/msvc-fix' * rj/msvc-fix: msvc: Fix macro redefinition warnings msvc: Fix build by adding missing INTMAX_MAX define msvc: git-daemon.exe: Fix linker "unresolved externals" error msvc: Fix compilation errors in compat/win32/sys/poll.c
Junio C Hamano
Merge branch 'nd/extended-sha1-relpath' * nd/extended-sha1-relpath: get_sha1: teach ":$n:<path>" the same relative path logic get_sha1: support relative path ":path" syntax Make prefix_path() return char* without const Conflicts: sha1_name.c
Junio C Hamano
Merge branch 'aa/status-hilite-branch' * aa/status-hilite-branch: default color.status.branch to "same as header" status: show branchname with a configurable color
Junio C Hamano
Merge branch 'ak/describe-exact' * ak/describe-exact: describe: Delay looking up commits until searching for an inexact match describe: Store commit_names in a hash table by commit SHA1 describe: Do not use a flex array in struct commit_name describe: Use for_each_rawref
Junio C Hamano
Merge branch 'nd/maint-relative' * nd/maint-relative: get_cwd_relative(): do not misinterpret root path
Junio C Hamano
Merge branch 'jn/maint-svn-fe' * jn/maint-svn-fe: t9010 fails when no svn is available vcs-svn: fix intermittent repo_tree corruption treap: make treap_insert return inserted node t9010 (svn-fe): Eliminate dependency on svn perl bindings
Junio C Hamano
Merge branch 'jc/maint-svn-info-test-fix' * jc/maint-svn-info-test-fix: t9119: do not compare "Text Last Updated" line from "svn info"
Junio C Hamano
Merge branch 'jn/submodule-b-current' * jn/submodule-b-current: git submodule: Remove now obsolete tests before cloning a repo git submodule -b ... of current HEAD fails
Junio C Hamano
Merge branch 'jn/maint-fast-import-object-reuse' * jn/maint-fast-import-object-reuse: fast-import: insert new object entries at start of hash bucket
Junio C Hamano
Merge branch 'jn/fast-import-ondemand-checkpoint' * jn/fast-import-ondemand-checkpoint: fast-import: treat SIGUSR1 as a request to access objects early
Junio C Hamano
Sync with 1.7.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.3.4
Junio C Hamano
Git 1.7.2.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.2.5
Junio C Hamano
Git 1.7.1.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.1.4
Junio C Hamano
Git 1.7.0.9 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.0.9
Junio C Hamano
Git 1.6.6.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.6.3
Junio C Hamano
Git 1.6.5.9 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.5.9
Junio C Hamano
Git 1.6.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.4.5
Jakub Narębski
gitweb: Introduce esc_attr to escape attributes of HTML elements It is needed only to escape attributes of handcrafted HTML elements, and not those generated using CGI.pm subroutines / methods for HTML generation. While at it, add esc_url and esc_html where needed, and prefer to use CGI.pm HTML generating methods than handcrafted HTML code. Most of those are probably unnecessary (could be exploited only by person with write access to gitweb config, or at leas…
Jonathan Nieder
Merge branch 'master' (early part) into pd/bash-4-completion * 'master' (early part): (529 commits) completion: fix zsh check under bash with 'set -u' Fix copy-pasted comments related to tree diff handling. Git 1.7.3.2 {cvs,svn}import: use the new 'git read-tree --empty' t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To' Clarify and extend the "git diff" format documentation git-show-ref.txt: clarify the pattern matching …
Jonathan Nieder
bash: simple reimplementation of _get_comp_words_by_ref Add a minimal implementation of _get_comp_words_by_ref so $ git show head:g <tab><tab> on bash 4 can complete paths within the head commit without requiring the bash_completion functions to be loaded. This is a follow-up to the previous patch (bash: get --pretty=m<tab> completion to work with bash v4). Based on bash-completion 2.x (commit bf763033, 2010-10-26) but tweaked for simplicity and t…
  1. Prev
  2. Next