Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Update draft release notes to 1.6.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'lt/bool-on-off' * lt/bool-on-off: Documentation: boolean value may be given by on/off Allow users to un-configure rename detection
Junio C Hamano
Merge branch 'lt/pack-object-memuse' * lt/pack-object-memuse: show_object(): push path_name() call further down process_{tree,blob}: show objects without buffering Conflicts: builtin-pack-objects.c builtin-rev-list.c list-objects.c list-objects.h upload-pack.c
Junio C Hamano
Merge branch 'nd/archive-attribute' * nd/archive-attribute: archive test: attributes archive: do not read .gitattributes in working directory unpack-trees: do not muck with attributes when we are not checking out attr: add GIT_ATTR_INDEX "direction" archive tests: do not use .gitattributes in working directory
Junio C Hamano
Merge branch 'maint' * maint: Describe fixes since 1.6.2.3 doc/git-daemon: add missing arguments to max-connections option doc/git-daemon: add missing arguments to options init: Do not segfault on big GIT_TEMPLATE_DIR environment variable imap-send: use correct configuration variable in documentation
Junio C Hamano
Describe fixes since 1.6.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint-1.6.1' into maint * maint-1.6.1:
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: doc/git-daemon: add missing arguments to options init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
Junio C Hamano
Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint * bs/maint-1.6.0-tree-walk-prefix: match_tree_entry(): a pathspec only matches at directory boundaries tree_entry_interesting: a pathspec only matches at directory boundary
Junio C Hamano
Merge branch 'js/maint-submodule-checkout' into maint * js/maint-submodule-checkout: Fix 'git checkout <submodule>' to update the index
Junio C Hamano
Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint * cb/maint-merge-recursive-submodule-fix: simplify output of conflicting merge update cache for conflicting submodule entries add tests for merging with submodules
Markus Heidelberg
doc/git-daemon: add missing arguments to max-connections option Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint-1.6.0' into maint * maint-1.6.0: doc/git-daemon: add missing arguments to options init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
Markus Heidelberg
doc/git-daemon: add missing arguments to options Also fix some spellings and typos. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Frank Lichtenheld
init: Do not segfault on big GIT_TEMPLATE_DIR environment variable Signed-off-by: Frank Lichtenheld <flichtenheld@astaro.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Paul Bolle
imap-send: use correct configuration variable in documentation It's imap.pass (not imap.password). Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'ac/color-graph' * ac/color-graph: graph API: Added logic for colored edges
Junio C Hamano
Merge branch 'jk/cobdoc' * jk/cobdoc: docs/checkout: clarify what "non-branch" means doc/checkout: split checkout and branch creation in synopsis doc/checkout: refer to git-branch(1) as appropriate doc: refer to tracking configuration as "upstream" doc: clarify --no-track option
Junio C Hamano
Merge branch 'mk/apply-swap' * mk/apply-swap: builtin-apply: keep information about files to be deleted tests: test applying criss-cross rename patch
Junio C Hamano
Merge branch 'mm/add-p-quit' * mm/add-p-quit: Update git-add.txt according to the new possibilities of 'git add -p'. add-interactive: refactor mode hunk handling git add -p: new "quit" command at the prompt.
Junio C Hamano
Merge branch 'eb/upload-archive-from-git-shell' * eb/upload-archive-from-git-shell: git-shell: Add 'git-upload-archive' to allowed commands.
Junio C Hamano
Merge branch 'jc/shared-literally' * jc/shared-literally: t1301-shared-repo: fix forced modes test
Junio C Hamano
Merge branch 'ns/am-to-empty' * ns/am-to-empty: git-am: teach git-am to apply a patch to an unborn branch
Junio C Hamano
Merge branch 'bw/short-ref-strict' * bw/short-ref-strict: remote.c: use shorten_unambiguous_ref rev-parse: --abbrev-ref option to shorten ref name for-each-ref: utilize core.warnAmbiguousRefs for :short-format shorten_unambiguous_ref(): add strict mode
Junio C Hamano
Merge branch 'da/difftool' * da/difftool: mergetool--lib: simplify API usage by removing more global variables Fix misspelled mergetool.keepBackup difftool/mergetool: refactor commands to use git-mergetool--lib mergetool: use $( ... ) instead of `backticks` bash completion: add git-difftool difftool: add support for a difftool.prompt config variable difftool: add various git-difftool tests difftool: move 'gi…
Junio C Hamano
Merge branch 'maint' * maint: doc/gitattributes: clarify location of config text Fix buffer overflow in config parser git-apply: fix option description
Jeff King
doc/gitattributes: clarify location of config text The gitattributes documentation has a section on the "diff" attribute, with subsections for each of the things you might want to configure in your diff config section (external diff, hunk headers, etc). The first such subsection specifically notes that the definition of the diff driver should go into $GIT_DIR/config, but subsequent sections do not. This location is implied if you are reading the …
Pierre Habouzit
hook/update: example of how to prevent branch creation Since git doesn't provide a receive.denyBranchCreation or similar, here is an example of how to be sure users cannot create branches remotely by pushing a new reference. This setup has been proven useful to prevent creation of spurious branches because of users having their remote.origin.push set to HEAD, when they use `git push` while being on a local topic branch of theirs instead of the proper…
Junio C Hamano
Merge branch 'maint-1.6.1' into maint * maint-1.6.1: Fix buffer overflow in config parser
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: Fix buffer overflow in config parser
  1. Prev
  2. Next