Public Git Hosting - git/mergetool.git/search

2007-03-21	Junio C Hamano	blame: cmp_suspect is not "cmp" anymore. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-21	Nicolas Pitre	minor git-prune optimization Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-21	Nicolas Pitre	improve checkout message when asking for same branch Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-21	Linus Torvalds	Be more careful about zlib return values Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-21	Linus Torvalds	Don't ever return corrupt objects from "parse_object()" Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-21	Nicolas Pitre	index-pack: more validation checks and cleanups Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-21	Nicolas Pitre	index-pack: use hash_sha1_file() Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-21	Nicolas Pitre	don't ever allow SHA1 collisions to exist by fetching... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-20	Santi Béjar	git-fetch: Fix single_force in append_fetch_head Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-20	Junio C Hamano	Merge git://git2.kernel.org/pub/scm/gitk/gitk	commit \| commitdiff \| tree
2007-03-20	Chris Wright	make git clone -q suppress the noise with http fetch Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-20	Linus Torvalds	Fix loose object uncompression check. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-20	Shawn O. Pearce	contrib/continuous: a continuous integration build... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-20	Johannes Schindelin	Provide some technical documentation for shallow clones Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-20	Johannes Schindelin	Add a HOWTO for setting up a standalone git daemon Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-20	Johannes Schindelin	xdiff/xutils.c(xdl_hash_record): factor out whitespace... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-20	Junio C Hamano	blame: micro-optimize cmp_suspect() Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-20	James Bowes	Replace remaining instances of strdup with xstrdup. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-20	Nicolas Pitre	use a LRU eviction policy for the delta base cache Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-20	Nicolas Pitre	clean up the delta base cache size a bit Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-19	Junio C Hamano	GIT 1.5.1-rc1 Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-19	Junio C Hamano	Fix merge-index Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-19	Linus Torvalds	Set up for better tree diff optimizations Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-19	Linus Torvalds	Trivial cleanup of track_tree_refs() Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-19	Alexandre Julliard	git.el: Add support for commit hooks. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-19	Junio C Hamano	Merge branch 'jb/gc'	commit \| commitdiff \| tree
2007-03-19	Junio C Hamano	Merge branch 'fl/cvsserver'	commit \| commitdiff \| tree
2007-03-19	Shawn O. Pearce	Limit the size of the new delta_base_cache Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-19	Junio C Hamano	Merge branch 'sp/run-command'	commit \| commitdiff \| tree
2007-03-19	J. Bruce Fields	Make git-send-email aware of Cc: lines. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-18	Junio C Hamano	Update main git.html page to point at 1.5.0.5 documentation Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-18	Junio C Hamano	Merge branch 'ar/diff'	commit \| commitdiff \| tree
2007-03-18	Linus Torvalds	Avoid unnecessary strlen() calls Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-18	Nicolas Pitre	Reuse cached data out of delta base cache. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-18	Linus Torvalds	Implement a simple delta_base cache Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-18	Linus Torvalds	Make trivial wrapper functions around delta base generation... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-18	Junio C Hamano	Merge 1.5.0.5 in from 'maint'	commit \| commitdiff \| tree
2007-03-18	Junio C Hamano	GIT 1.5.0.5 Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-17	James Bowes	Make gc a builtin. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-17	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2007-03-17	Nicolas Pitre	[PATCH] clean up pack index handling a bit Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-17	Nicolas Pitre	[PATCH] add test for OFS_DELTA objects Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-17	Nicolas Pitre	[PATCH] fix t5300-pack-object.sh Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-17	Nicolas Pitre	[PATCH] local-fetch.c: some error printing cleanup Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-17	Junio C Hamano	applymbox: brown paper bag fix. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-16	Santi Béjar	git-merge: finish when git-read-tree fails Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-16	Alex Riesen	Add tests for --quiet option of diff programs	commit \| commitdiff \| tree
2007-03-16	Shawn O. Pearce	use xstrdup please Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-16	Paolo Bonzini	git-fetch, git-branch: Support local --track via a... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	try-to-simplify-commit: use diff-tree --quiet machinery. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	revision.c: explain what tree_difference does Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	Teach --quiet to diff backends. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	diff --quiet Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	Remove unused diffcore_std_no_resolve Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Alex Riesen	Allow git-diff exit with codes similar to diff(1) Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	Merge GIT 1.5.0.4	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	GIT 1.5.0.4 Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Yann Dirson	Clarify doc for git-config --unset-all. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	git-checkout: fix "eval" used for merge labelling. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Andy Parkins	update-hook: fix incorrect use of git-describe and... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Frank Lichtenheld	cvsserver: further improve messages on commit and status Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Frank Lichtenheld	cvsserver: Be more chatty Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	Merge branch 'jc/repack'	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	Merge branch 'jc/fetch'	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	Merge branch 'dz/mailinfo'	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	Merge branch 'jb/per-user-exclude'	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	Merge branch 'pb/branch-track'	commit \| commitdiff \| tree
2007-03-14	Jim Meyering	git-grep: don't use sscanf Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Johannes Schindelin	Do not output "GEN " when generating perl.mak Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	shortlog: prompt when reading from terminal by mistake Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	Documentation: add git-mergetool to the command list. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git/mergetool	commit \| commitdiff \| tree
2007-03-14	Eric Wong	git-svn: add -l/--local command to "git svn rebase" Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-14	Frank Lichtenheld	cvsserver: asciidoc formatting changes Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-13	Shawn O. Pearce	Use run_command within send-pack Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-13	Shawn O. Pearce	Use run_command within receive-pack to invoke index... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-13	Shawn O. Pearce	Use run_command within merge-index Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-13	Shawn O. Pearce	Use run_command for proxy connections Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-13	Shawn O. Pearce	Use RUN_GIT_CMD to run push backends Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-13	Shawn O. Pearce	Correct new compiler warnings in builtin-revert Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-13	Shawn O. Pearce	Replace fork_with_pipe in bundle with run_command Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-13	Shawn O. Pearce	Teach run-command to redirect stdout to /dev/null Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-13	Shawn O. Pearce	Teach run-command about stdout redirection Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-13	Don Zickus	Add a couple more test cases to the suite. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-13	Don Zickus	restrict the patch filtering Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-13	Don Zickus	builtin-mailinfo.c infrastrcture changes Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-13	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	commit \| commitdiff \| tree
2007-03-13	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2007-03-13	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git/fastimport	commit \| commitdiff \| tree
2007-03-13	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git/fastimport...	commit \| commitdiff \| tree
2007-03-13	Shawn O. Pearce	Fix t5510-fetch's use of sed Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-12	Shawn O. Pearce	Simplify closing two fds at once in run-command.c Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-12	Shawn O. Pearce	Don't package the git-gui credits file anymore Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-12	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	commit \| commitdiff \| tree
2007-03-12	Linus Torvalds	Re-fix get_sha1_oneline() Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-12	Johannes Schindelin	git-bundle: only die if pack would be empty, warn if... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-12	Avi Kivity	git-send-email: configurable bcc and chain-reply-to Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2007-03-12	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2007-03-12	Avi Kivity	git-send-email: Document configuration options Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
next

Git mergetool

RSS Atom