1. Stefan Saasen
  2. git

Commits

Author Commit Message Date Builds
Junio C Hamano
Merge branch 'mo/maint-crlf-doc' into maint * mo/maint-crlf-doc: core.autocrlf documentation: mention the crlf attribute
Junio C Hamano
Merge branch 'th/remote-usage' into maint * th/remote-usage: git remote: Separate usage strings for subcommands
Junio C Hamano
Merge branch 'pb/maint-use-custom-perl' into maint * pb/maint-use-custom-perl: Make sure $PERL_PATH is defined when the test suite is run.
Junio C Hamano
Merge branch 'mm/config-pathname-tilde-expand' into maint * mm/config-pathname-tilde-expand: Documentation: avoid xmlto input error expand_user_path: expand ~ to $HOME, not to the actual homedir. Expand ~ and ~user in core.excludesfile, commit.template
Junio C Hamano
Merge branch 'bc/grep-i-F' into maint * bc/grep-i-F: grep: Allow case insensitive search of fixed-strings
Junio C Hamano
Merge branch 'jk/maint-break-rename-reduce-memory' into maint * jk/maint-break-rename-reduce-memory: diffcore-rename: reduce memory footprint by freeing blob data early diffcore-break: save cnt_data for other phases diffcore-break: free filespec data as we go
Junio C Hamano
Merge branch 'rj/maint-simplify-cygwin-makefile' into maint * rj/maint-simplify-cygwin-makefile: Makefile: merge two Cygwin configuration sections into one
Junio C Hamano
Merge branch 'rg/doc-workflow' into maint * rg/doc-workflow: Add branch management for releases to gitworkflows
Junio C Hamano
Merge branch 'np/maint-sideband-favor-status' into maint * np/maint-sideband-favor-status: give priority to progress messages
Jakub Narębski
gitweb: Describe (possible) gitweb.js minification in gitweb/README Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Documentation: xmlto 0.0.18 does not know --stringparam Newer DocBook stylesheets want man.base.url.for.relative.links parameter set when formatting manpages with external references to turn them into full URLs, and leave a helpful "you should set this parameter" message in the output. Earlier we added the MAN_BASE_URL make variable to specify the value for it. When MAN_BASE_URL is not given, it ought to be safe to set the parameter to empty; it woul…
Johan Herland
Fix crasher on encountering SHA1-like non-note in notes tree When loading a notes tree, the code primarily looks for SHA1-like paths whose total length (discounting directory separators) are 40 chars (interpreted as valid note entries) or less (interpreted as subtree entries that may in turn contain note entries when unpacked). However, there is an additional condition that must hold for valid subtree entries: They must be _tree_ objects (duh). This patch…
Brandon Casey
t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' The '--no-chain-reply-to' option is a Getopt::Long boolean option. The '--no-' prefix (as in --no-chain-reply-to) for boolean options is not supported in Getopt::Long version 2.32 which was released with Perl 5.8.0. This version only supports '--no' as in '--nochain-reply-to'. More recent versions of Getopt::Long, such as version 2.34, support either prefix. So use the older form in the tests. S…
Brandon Casey
t4201: use ISO8859-1 rather than ISO-8859-1 Some ancient platforms do not have an extensive list of alternate names for character encodings. For example, Solaris 7 and IRIX 6.5 do not know that ISO-8859-1 is the same as ISO8859-1. Modern platforms do know this, so use the older name. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jan Krüger
pull: clarify advice for the unconfigured error case When pull --rebase fails because it cannot find what branch to merge against, the error message implies we are trying to merge. Say "rebase against" instead of "merge with" to avoid confusion. The configuration suggested to remedy the situation uses a confusing syntax, with variables specified in the dotted form accepted by 'git config' but separated from their values by the '=' delimiter used by…
Junio C Hamano
Merge in 1.6.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.6.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.5.4
Junio C Hamano
Unconditionally set man.base.url.for.relative.links Even setting it to empty is better than leaving it unset as it prevents the warning cruft from appearing in the output. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint'
Junio C Hamano
Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make Signed-off-by: Junio C Hamano <junio@kernel.org>
Junio C Hamano
Git 1.6.6-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.6-rc1
Horst H. von Brand
git-pull.sh: Fix call to git-merge for new command format Now "git merge <msg> HEAD" is officially deprecated, we should clean our own use as well. Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: Prepare for 1.6.5.4 merge: do not add standard message when message is given with -m option Do not misidentify "git merge foo HEAD" as an old-style invocation Conflicts: RelNotes
Junio C Hamano
Prepare for 1.6.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
merge: do not add standard message when message is given with -m option Even if the user explicitly gave her own message to "git merge", the command still added its standard merge message. It resulted in a useless repetition like this: % git merge -m "Merge early part of side branch" `git rev-parse side~2` % git show -s commit 37217141e7519629353738d5e4e677a15096206f Merge: e68e646 a1d2374 Author: しらいし ななこ <nanako3@lavabit.com> Date: Wed De…
Junio C Hamano
Do not misidentify "git merge foo HEAD" as an old-style invocation This was misinterpreted as an ancient style "git merge <message> HEAD <commit> <commit>..." that merges one (or more) <commit> into the current branch and record the resulting commit with the given message. Then a later sanity check found that there is no <commit> specified and gave a usage message. Tested-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.co…
Junio C Hamano
Update draft release notes to 1.6.6 before -rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: help: Do not unnecessarily look for a repository Documentation: Fix a few i.e./e.g. mix-ups Documentation: Document --branch option in git clone synopsis
Junio C Hamano
Merge branch 'jc/deprecate-old-syntax-from-merge' * jc/deprecate-old-syntax-from-merge: git-merge: a deprecation notice of the ancient command line syntax
Junio C Hamano
git-merge: a deprecation notice of the ancient command line syntax The ancient form of git merge command used in the original sample script has been copied from Linus and are still found everywhere, I think, and people may still have it in their scripts, but on the other hand, it is so unintuitive that even people reasonably familiar with git are surprised by accidentally triggering the support to parse this ancient form. Gently nudge people to upgrade their scr…
  1. Prev
  2. Next