* jc/clone-bind-failure:
fetch/clone: check return status from ls-remote
gitweb.css: Use monospace fonts for commits and tree-diff.
Do not use perl in git-commit.sh
diff: Support 256 colors
diff: Support both attributes and colors
Documentation about exclude/ignore files
daemon: new option --detach to run git-daemon in background
daemon: new option --pid-file=<path> to store the pid
upload-pack: ignore write errors to stderr
daemon: if one of the standard fds is missing open it to /dev/null
daemon: use a custom die routine with syslog
Documentation: Fix ssh://[user@]host.xz URL
Adjust t4013 tests to corrected format-patch.
format-patch: Generate a newline between the subject header and the message body
t4013 diff format tests update
Display help for Git mode after pressing `h' or `?' in *git-status*
Wrap long lines in docstrings in contrib/emacs/git.el
Use .git/info/exclude in the example in git-ls-files.txt,
instead of .git/ignore, and update the list of commands looking
at .git/info/exclude in repository-layout.txt.
Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Earlier commit c3f17061 broke asciidoc markup.
Noticed by Alp Toker with a fix, but fixed up in a way with smaller
formatting impact.
Signed-off-by: Junio C Hamano <junkio@cox.net>
* ml/trace:
test-lib: unset GIT_TRACE
GIT_TRACE: fix a mixed declarations and code warning
GIT_TRACE: show which built-in/external commands are executed
* sp/reflog:
Log ref changes made by resolve.
Log ref changes made by quiltimport.
Log ref changes made by git-merge and git-pull.
git-fetch: fix a bashism (==)
Make the unpacked object header functions static to sha1_file.c
git-send-email: Remove redundant Reply-To header
typofix (git-name-rev documentation)
Mention the [user@] part in documentation of ssh:// urls.
tests: Set EDITOR=: and VISUAL=: globally
* master:
Log ref changes made by git-fetch and git-pull.
Record the type of commit operation in the reflog.
Allow user.name and user.email to drive reflog entry.
Fix linking for not-so-clever linkers.
git-rev-list: add documentation for --parents, --no-merges
* master:
Avoid C99 comments, use old-style C comments instead.
Fix more typos, primarily in the code
gitweb.cgi: Teach "a=blob" action to know the blob/file mime type
gitweb.cgi: Create $git_temp if it doesn't exist
git-svn: fix --file/-F option in commit-diff
Avoid C99 initializers
The only visible change is that git-blame doesn't understand
"--compability" anymore, but it does accept "--compatibility" instead,
which is already documented.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
* ew/diff:
templates/hooks--update: replace diffstat calls with git diff --stat
diff: do not use configuration magic at the core-level
Update diff-options and config documentation.
diff.c: --no-color to defeat diff.color configuration.
diff.c: respect diff.renames config option
* ew/svn:
Fix some doubled word typos
Typofix in Makefile comment.
Makefile: export NO_SVN_TESTS
git-svn: migrate out of contrib (follow-up)
git-svn: migrate out of contrib
* js/merge-base:
Additional merge-base tests (revised)
merge-base: update the clean-up postprocessing
Fix typos involving the word 'commit'
Fix some doubled word typos
"git -p cmd" to page anywhere
change ent to tree in git-diff documentation
Assorted typo fixes
* ml/trace:
GIT_TRACE: fix a mixed declarations and code warning
GIT_TRACE: show which built-in/external commands are executed
Disable color detection during format-patch
git-cvsexportcommit can't handle merge commits correctly
Using 'perl' in *.sh
sed -e '/RE/r rfile/' needs space in 'r rfile'
Close the index file between writing and committing
colored diff: diff.color = auto fix
With the environment variable GIT_TRACE set git will show
- alias expansion
- built-in command execution
- external command execution
on stderr.
Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
* ew/diff:
Update diff-options and config documentation.
diff.c: --no-color to defeat diff.color configuration.
diff.c: respect diff.renames config option
diff-options: Explain --text and -a
Add -a and --text to common diff options help
Teach diff -a as shorthand for --text
Teach --text option to diff
diff.renames is mentioned several times in the documentation,
but to my surprise it didn't do anything before this patch.
Also add the --no-renames option to override this from the
command-line.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Allow NO_SVN_TESTS to be defined to skip git-svn tests. These
tests are time-consuming due to SVN being slow, and even more so
if SVN Perl libraries are not available.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
* ew/instaweb:
instaweb: fix unportable ';' usage in sed
Makefile: replace ugly and unportable sed invocation
Add git-instaweb, instantly browse the working repo with gitweb
gitweb: Declare global variables with "our"
gitweb: Enable tree (directory) history display
gitweb: optimize per-file history generation
* jc/fmt-merge-msg-test:
t6200: fmt-merge-msg test.
send-email: do not barf when Term::ReadLine does not like your terminal
boolean: accept yes and no as well
annotate: Correct most merge following to annotate correctly.
annotate: Support annotation of files on other revisions.
Make zlib compression level configurable, and change default.
This accessor will retrieve value(s) of the given configuration variable.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
With the change in default, "git add ." on kernel dir is about
twice as fast as before, with only minimal (0.5%) change in
object size. The speed difference is even more noticeable
when committing large files, which is now up to 8 times faster.
The configurability is through setting core.compression = [-1..9]
which maps to the zlib constants; -1 is the default, 0 is no
compression, and 1..9 are various speed/size tradeoffs, 9
being slowest.
Signed-off-by: Joachim B Haga (cjhaga@fys.uio.no)
Acked-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
* js/merge-base:
commit.c: do not redefine UNINTERESTING bit.
Fold get_merge_bases_clean() into get_merge_bases()
Make clear_commit_marks() clean harder
Add '...' operator for revisions
Add get_merge_bases_clean()
* ew/instaweb:
Add git-instaweb, instantly browse the working repo with gitweb
gitweb: Declare global variables with "our"
gitweb: Enable tree (directory) history display
gitweb: optimize per-file history generation
* lt/gitweb:
gitweb: Declare global variables with "our"
gitweb: Enable tree (directory) history display
gitweb: optimize per-file history generation
git object hash cleanups
revision.c: --full-history fix.
Fix errno usage in connect.c
Minor documentation fixup.
git-svn: allow a local target directory to be specified for init
don't load objects needlessly when repacking
I got tired of having to configure gitweb for every repository
I work on. I sometimes prefer gitweb to standard GUIs like gitk
or gitview; so this lets me automatically configure gitweb to
browse my working repository and also opens my browser to it.
Updates from the original patch:
Added Apache/mod_perl2 compatibility if Dennis Stosberg's gitweb
has been applied, too: <20060621130708.Gcbc6e5c@leonov.stosberg.net>
General cleanups in shell code usage.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
'A...B' is a shortcut for 'A B --not $(git-merge-base --all A B)'.
This XOR-like operation is called symmetric difference in set
theory.
The symbol '...' has been chosen because it's rather similar to the
existing '..' operator and the somewhat more natural caret ('^') is
already taken.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This patch renames man1 and man7 variables to man1dir and man7dir,
according to "Makefile Conventions: Variables for Installation
Directories" in make.info of GNU Make.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Makefiles in subdirectories now use existing value of INSTALL, bindir,
mandir if it is set, allowing those to be set in main Makefile or in
included config.mak. Main Makefile exports variables which it sets.
Accidentally it renames bin to bindir in Documentation/Makefile
(should be bindir from start, but is unused, perhaps to be removed).
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
* ew/rebase:
rebase: allow --skip to work with --merge
rebase: cleanup rebasing with --merge
rebase: allow --merge option to handle patches merged upstream
