Commits

Author Commit Message Labels Comments Date
Christian Couder
gitk: Ignore gitk-wish buildproduct gitk, when bound into the git.git project tree, used to live at the root level, but in 62ba514 (Move gitk to its own subdirectory, 2007-11-17) it was moved to a subdirectory. The code used to track changes to TCLTK_PATH (which should cause gitk to be rebuilt to point at the new interpreter) was left in the main Makefile instead of being moved to the new Makefile that was created for the gitk proj…
Junio C Hamano
Merge branch 'nd/fix-directory-attrs-off-by-one' into maint The attribute mechanism didn't allow limiting attributes to be applied to only a single directory itself with "path/" like the exclude mechanism does. The initial implementation of this that was merged to 'maint' and 1.8.1.1 had severe performance degradations. * nd/fix-directory-attrs-off-by-one: attr: avoid calling find_basename() twice per path attr: fix off-by-one directory component len…
Junio C Hamano
Merge branch 'ph/rebase-preserve-all-merges' into maint "git rebase --preserve-merges" lost empty merges in recent versions of Git. * ph/rebase-preserve-all-merges: rebase --preserve-merges: keep all merge commits including empty ones
Junio C Hamano
README: update stale and/or incorrect information Ramkumar Ramachandra noticed that the old address for the marc archive no longer works. Update it to its marc.info address, and also refer to the gmane site. Remove the reference to "note from the maintainer", which is not usually followed by any useful discussion on status, direction nor tasks. Also replace the reference to "What's in git.git" with "What's cooking". Signed-off-by: Junio C Ham…
Junio C Hamano
Merge branch 'jk/remote-helpers-in-python-3' into next Prepare remote-helper test written in Python to be run with Python3. * jk/remote-helpers-in-python-3: git-remote-testpy: fix path hashing on Python 3
Branches
next
Junio C Hamano
Merge branch 'mm/add-u-A-sans-pathspec' into next Forbid "git add -u" and "git add -A" without pathspec run from a subdirectory, to train people to type "." (or ":/") to make the choice of default does not matter. * mm/add-u-A-sans-pathspec: add: warn when -u or -A is used without pathspec
Branches
next
Junio C Hamano
Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into next We used to stuff "user@" and then append what we read from /etc/mailname to come up with a default e-mail ident, but a bug lost the "user@" part. This is to fix it. * jn/do-not-drop-username-when-reading-from-etc-mailname: ident: do not drop username when reading from /etc/mailname
Branches
next
Junio C Hamano
Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into next Warn people that other tools are more recommendable over cvsimport+cvsps2 combo when doing a one-shot import, and cvsimport will not work with cvsps3. * jk/cvsimport-does-not-work-with-cvsps3: git-cvsimport.txt: cvsps-2 is deprecated
Branches
next
Junio C Hamano
Merge branch 'jc/push-reject-reasons' into next Improve error and advice messages given locally when "git push" refuses when it cannot compute fast-forwardness by separating these cases from the normal "not a fast-forward; merge first and push again" case. * jc/push-reject-reasons: push: finishing touches to explain REJECT_ALREADY_EXISTS better push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE push: further simplify the logic to …
Branches
next
Junio C Hamano
Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into next Scripts to test bash completion was inherently flaky as it was affected by whatever random things the user may have on $PATH. * jc/do-not-let-random-file-interfere-with-completion-tests: t9902: protect test from stray build artifacts
Branches
next
Junio C Hamano
Merge branch 'as/test-cleanup' into next * as/test-cleanup: t7102 (reset): don't hardcode SHA-1 in expected outputs
Branches
next
Junio C Hamano
Merge branch 'jk/config-parsing-cleanup' into next Configuration parsing for tar.* configuration variables were broken. Introduce a new config-keyname parser API to make the callers much less error prone. * jk/config-parsing-cleanup: reflog: use parse_config_key in config callback help: use parse_config_key for man config submodule: simplify memory handling in config parsing submodule: use parse_config_key when parsing config userdiff: …
Branches
next
Junio C Hamano
Sync with 1.8.1.2
Branches
next
Junio C Hamano
Update draft release notes to 1.8.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Sync with 1.8.1.2
Junio C Hamano
Git 1.8.1.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.8.1.2
Junio C Hamano
Merge branch 'ss/help-htmlpath-config-doc' into maint * ss/help-htmlpath-config-doc: config.txt: Document help.htmlpath config parameter
Junio C Hamano
Merge branch 'nd/attr-debug-fix' into maint * nd/attr-debug-fix: attr: make it build with DEBUG_ATTR again
Junio C Hamano
Merge branch 'ds/completion-silence-in-tree-path-probe' into maint * ds/completion-silence-in-tree-path-probe: git-completion.bash: silence "not a valid object" errors
Junio C Hamano
Merge branch 'jn/maint-trim-vim-contrib' into maint * jn/maint-trim-vim-contrib: contrib/vim: simplify instructions for old vim support
Junio C Hamano
Merge branch 'pe/doc-email-env-is-trumped-by-config' into maint * pe/doc-email-env-is-trumped-by-config: git-commit-tree(1): correct description of defaults
Junio C Hamano
Merge branch 'mk/complete-tcsh' into maint Command line completion for "tcsh" emitted an unwanted space after completing a single directory name. * mk/complete-tcsh: Prevent space after directories in tcsh completion
Junio C Hamano
Merge branch 'ap/status-ignored-in-ignored-directory' into maint Output from "git status --ignored" did not work well when used with "--untracked". * ap/status-ignored-in-ignored-directory: status: always report ignored tracked directories git-status: Test --ignored behavior dir.c: Make git-status --ignored more consistent
Junio C Hamano
Merge branch 'er/stop-recommending-parsecvs' into maint * er/stop-recommending-parsecvs: Remove the suggestion to use parsecvs, which is currently broken.
Junio C Hamano
Merge branch 'mh/ceiling' into maint An element on GIT_CEILING_DIRECTORIES list that does not name the real path to a directory (i.e. a symbolic link) could have caused the GIT_DIR discovery logic to escape the ceiling. * mh/ceiling: string_list_longest_prefix(): remove function setup_git_directory_gently_1(): resolve symlinks in ceiling paths longest_ancestor_length(): require prefix list entries to be normalized longest_an…
Junio C Hamano
Merge branch 'tb/t0050-maint' Update tests that were expecting to fail due to a bug that was fixed earlier. * tb/t0050-maint: t0050: Use TAB for indentation t0050: honor CASE_INSENSITIVE_FS in add (with different case) t0050: known breakage vanished in merge (case change)
Junio C Hamano
Merge branch 'dl/am-hg-locale' Datestamp recorded in "Hg" format patch was reformatted incorrectly to an e-mail looking date using locale dependant strftime, causing patch application to fail. * dl/am-hg-locale: am: invoke perl's strftime in C locale
Junio C Hamano
Merge branch 'jc/help' A header file that has the definition of a static array was included in two places, wasting the space. * jc/help: help: include <common-cmds.h> only in one file
Junio C Hamano
Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash' Fix use of an array notation that older versions of bash do not understand. * bc/fix-array-syntax-for-3.0-in-completion-bash: git-completion.bash: replace zsh notation that breaks bash 3.X
Matthieu Moy
add: warn when -u or -A is used without pathspec Most Git commands that can be used with or without pathspec operate tree-wide by default, the pathspec being used to restrict their scope. A few exceptions are: 'git grep', 'git clean', 'git add -u' and 'git add -A'. When run in a subdirectory without pathspec, they operate only on paths in the current directory. The inconsistency of 'git add -u' and 'git add -A' is particularly problematic sin…
  1. Prev
  2. Next