Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Update draft release notes to 1.7.7 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'cb/partial-commit-relative-pathspec' * cb/partial-commit-relative-pathspec: commit: allow partial commits with relative paths
Junio C Hamano
Merge branch 'jk/fast-export-quote-path' * jk/fast-export-quote-path: fast-export: quote paths in output
Junio C Hamano
Merge branch 'rc/maint-http-wrong-free' * rc/maint-http-wrong-free: Makefile: some changes for http-related flag documentation http.c: fix an invalid free() Conflicts: Makefile
Junio C Hamano
Merge branch 'rs/grep-function-context' * rs/grep-function-context: grep: long context options grep: add option to show whole function as context
Junio C Hamano
Merge branch 'ef/ipv4-connect-error-report' * ef/ipv4-connect-error-report: connect: only log if all attempts failed (ipv4)
Junio C Hamano
Merge branch 'oa/pull-reflog' * oa/pull-reflog: pull: remove extra space from reflog message Conflicts: git-pull.sh
Junio C Hamano
Merge branch 'ms/reflog-show-is-default' * ms/reflog-show-is-default: reflog: actually default to subcommand 'show'
Junio C Hamano
Merge branch 'jl/submodule-status-summary-doc' * jl/submodule-status-summary-doc: Documentation/submodule: add command references and update options
Junio C Hamano
Merge branch 'jn/gitweb-config-list-case' * jn/gitweb-config-list-case: gitweb: Git config keys are case insensitive, make config search too
Junio C Hamano
Merge branch 'jl/submodule-update-quiet' * jl/submodule-update-quiet: submodule: update and add must honor --quiet flag
Junio C Hamano
Merge branch 'js/ls-tree-error' * js/ls-tree-error: Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. Add a test to check that git ls-tree sets non-zero exit code on error.
Junio C Hamano
Merge branch 'jn/gitweb-system-config' * jn/gitweb-system-config: gitweb: Introduce common system-wide settings for convenience
Junio C Hamano
Merge branch 'jk/reset-reflog-message-fix' * jk/reset-reflog-message-fix: reset: give better reflog messages
Junio C Hamano
Merge branch 'jc/diff-index-refactor' * jc/diff-index-refactor: diff-lib: refactor run_diff_index() and do_diff_cache() diff-lib: simplify do_diff_cache()
Junio C Hamano
Merge branch 'maint' * maint: filter-branch: Export variable `workdir' for --commit-filter Documentation/Makefile: add *.pdf to `clean' target Documentation: ignore *.pdf files
Michael Witten
filter-branch: Export variable `workdir' for --commit-filter According to `git help filter-branch': --commit-filter <command> ... You can use the _map_ convenience function in this filter, and other convenience functions, too... ... However, it turns out that `map' hasn't been usable because it depends on the variable `workdir', which is not propogated to the environment of the shell that runs the commit-…
Emilio G. Cota
Documentation/Makefile: add *.pdf to `clean' target user-manual.pdf is not removed by `make clean'; fix it. Signed-off-by: Emilio G. Cota <cota@braap.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Emilio G. Cota
Documentation: ignore *.pdf files user-manual.pdf is generated by the build and therefore should be ignored by git. Signed-off-by: Emilio G. Cota <cota@braap.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
fast-export: quote paths in output Many pathnames in a fast-import stream need to be quoted. In particular: 1. Pathnames at the end of an "M" or "D" line need quoting if they contain a LF or start with double-quote. 2. Pathnames on a "C" or "R" line need quoting as above, but also if they contain spaces. For (1), we weren't quoting at all. For (2), we put double-quotes around the paths to handle spaces, but ignored…
Junio C Hamano
Merge branch 'tc/minix' * tc/minix: Makefile: add Minix configuration options.
Junio C Hamano
Merge branch 'jc/pack-order-tweak' * jc/pack-order-tweak: pack-objects: optimize "recency order" core: log offset pack data accesses happened
Jeff King
docs: put listed example commands in backticks Many examples of git command invocation are given in asciidoc listing blocks, which makes them monospaced and avoids further interpretation of special characters. Some manpages make a list of examples, like: git foo:: Run git foo. git foo -q:: Use the "-q" option. to quickly show many variants. However, they can sometimes be hard to read, because they are shown in a proportional-wi…
张忠山
gitweb: pass string after encoding in utf-8 to syntax highlighter Otherwise the highlight filter would work on a corrupt byte sequence. Signed-off-by: 张忠山 <zzs213@126.com> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jon Jensen
Add option hooks.diffopts to customize change summary in post-receive-email This makes it easy to customize the git diff-tree options, for example to include -p to include inline diffs. It defaults to the current options "--stat --summary --find-copies-harder" and thus is backward-compatible. Signed-off-by: Jon Jensen <jon@endpoint.com> Improved-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: add gitignore entry to description about how to write a builtin gitattributes: Reword "attribute macro" to "macro attribute" gitattributes: Clarify discussion of attribute macros
Heiko Voigt
add gitignore entry to description about how to write a builtin If the author forgets the gitignore entry the built result will show up as new file in the git working directory. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tay Ray Chuan
Makefile: some changes for http-related flag documentation Rename git-http-pull to git-http-fetch. This was passed over in 215a7ad (Big tool rename, Wed Sep 7 17:26:23 2005 -0700). Also, distinguish between dumb and smart in flag docs, as the "warnings" in NO_CURL and NO_EXPACT are no longer accurate given the introduction of smart http(s). Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tay Ray Chuan
http.c: fix an invalid free() Remove a free() on the static buffer returned by sha1_file_name(). While we're at it, replace xmalloc() calls on the structs http_(object|pack)_request with xcalloc() so that pointers in the structs get initialized to NULL. That way, free()'s are safe - for example, a free() on the url string member when aborting. This fixes an invalid free(). Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.…
Michael Haggerty
gitattributes: Reword "attribute macro" to "macro attribute" The new wording makes it clearer that such a beast is an attribute in addition to being a macro (as opposed to being only a macro that is used for attributes). Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next