Public Git Hosting - git/mergetool.git/search

2006-08-13	Junio C Hamano	Merge branch 'ml/pager'	commit \| commitdiff \| tree
2006-08-13	Junio C Hamano	GIT 1.4.2	commit \| commitdiff \| tree
2006-08-13	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	commit \| commitdiff \| tree
2006-08-13	Junio C Hamano	t/t4013: fix futzing with the version string. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-13	Junio C Hamano	Better error message when we are unable to lock the... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-13	Junio C Hamano	git-am: give better diagnostics when the patch does... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-12	Junio C Hamano	Merge branch 'rj/header'	commit \| commitdiff \| tree
2006-08-12	Eric Wong	git-svn: split the path from the url correctly with... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-12	Junio C Hamano	git-sh-setup: do not use repo-config to test the git... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-11	Eric Wong	git-svn: bugfix: allow SVN:: lib users to track the... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-11	Eric Wong	git-svn: correctly kill keyword expansion without munging... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-11	Rene Scharfe	drop length argument of has_extension Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-11	Junio C Hamano	Merge branch 'rn/push-dav'	commit \| commitdiff \| tree
2006-08-10	Rutger Nijlunsing	Add Documentation/howto/setup-git-server-over-http.txt Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-10	Rene Scharfe	git-verify-pack: no need to count errors Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-10	Rene Scharfe	git-verify-pack: buffer overrun paranoia Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-10	Rene Scharfe	git-verify-pack: free pack after use and a cleanup Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-10	Rene Scharfe	git-verify-pack: get rid of while loop Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-10	Rene Scharfe	git-verify-pack: insist on .idx extension Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-10	Rene Scharfe	git-verify-pack: more careful path handling Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-10	Rene Scharfe	git-verify-pack: show usage when no pack was specified Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-10	Rene Scharfe	Add has_extension() Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-10	Junio C Hamano	builtin-apply: remove unused increment Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-10	Junio C Hamano	Fix git-diff A...B Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-10	Junio C Hamano	combine-diff: use color Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-10	Rutger Nijlunsing	http-push: Make WebDAV work with (broken?) default... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-10	Junio C Hamano	git-apply: applying a patch to make a symlink shorter. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-09	Junio C Hamano	allow diff.renamelimit to be set regardless of -M/-C Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-09	Junio C Hamano	make --find-copies-harder imply -C Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-09	Junio C Hamano	find_unique_abbrev() with len=0 should not abbreviate Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-09	Junio C Hamano	check return value from diff_setup_done() Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-09	Junio C Hamano	Fix tutorial-2.html Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-09	Junio C Hamano	Documentation: git-status takes the same options as... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-09	Jonas Fonseca	Update git-init-db(1) and documentation of core.sharedRepository Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-08	Jeff King	git-push: allow pushing from subdirectories Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-08	Junio C Hamano	GIT-VERSION-GEN: adjust for ancient git Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-08	Junio C Hamano	builtin-mv: fix use of uninitialized memory. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-08	Junio C Hamano	debugging: XMALLOC_POISON Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-07	Ryan Anderson	annotate: Fix bug when parsing merges with differing... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-07	Ryan Anderson	log-tree: show_log() should respect the setting of... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-07	Michael Krelin	handle https:// protocol in git-clone Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-06	Junio C Hamano	Fix "grep -w" Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-05	Junio C Hamano	Makefile: Cygwin does not seem to need NO_STRLCPY Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-05	Ramsay Jones	commit walkers: setup_ident() to record correct committer... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-05	Ramsay Jones	Allow config file to specify Signed-off-by identity... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-04	Junio C Hamano	Merge branch 'jc/c99'	commit \| commitdiff \| tree
2006-08-04	Johannes Schindelin	Fix crash when GIT_DIR is invalid Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-04	Rene Scharfe	git-tar-tree: fix minor memory leak Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-04	Uwe Zeisberger	Document rev-list's option --merge Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-04	Junio C Hamano	Further clean-up: usage() vs die() Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-04	Ramsay Allan Jones	Replace some calls to die(usage_str) with usage(usage_str). Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-04	Ramsay Allan Jones	Fixup command names in some usage strings. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-03	Junio C Hamano	GIT 1.4.2-rc3 Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-03	Junio C Hamano	Documentation/git.txt: link git-svn and git-instaweb... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-03	Junio C Hamano	Merge branch 'jc/sideband'	commit \| commitdiff \| tree
2006-08-03	Junio C Hamano	sideband: do not use color, just say "remote:" Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-03	Junio C Hamano	Show both blob names from "git diff blob1 blob2" Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-03	Junio C Hamano	diff.c: do not use pathname comparison to tell renames Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-03	Junio C Hamano	Add a couple of subdirectory tests. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-03	Junio C Hamano	read-tree: shadowed variable fix. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-03	Michael	fixed variable declaration in gitk Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-03	Junio C Hamano	Fix "git diff blob1 blob2" showing the diff in reverse. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-03	Junio C Hamano	Cygwin needs NO_C99_FORMAT??? Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-03	Matthias Lederhofer	git-grep: document --and, --or, --not, ( and ) Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-03	Matthias Kestenholz	use declarations from builtin.h for builtin commands Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-03	Matthias Kestenholz	Make git-repo-config a builtin Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-02	Matthias Kestenholz	Make git-prune-packed a builtin Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-02	Jeff King	git-annotate: remove extraneous debugging line Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-02	Jeff King	Documentation: convert uses of git-link macro to gitlink Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-02	Jeff King	git-push: remove obsolete git-push.sh Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-02	Jeff King	git-push: allow -f as an alias for --force Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-02	Ramsay Allan Jones	Fix header breakage with _XOPEN_SOURCE. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-02	Ramsay Allan Jones	Remove cmd_usage() routine and re-organize the help... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-02	Ramsay Allan Jones	Fix header breakage due to redefining PATH_MAX. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-02	Ramsay Allan Jones	Add NO_C99_FORMAT to support older compilers. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-02	Ramsay Allan Jones	New tests and en-passant modifications to mktag. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-02	Ramsay Allan Jones	Fix installation of templates on ancient systems. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-02	Ramsay Allan Jones	Fix annotate test script; notice when git-annotate... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-02	Ramsay Allan Jones	Ensure git-clone exits with error if perl script fails. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-01	Junio C Hamano	fetch/clone: mark messages from remote side stand out. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-08-01	Junio C Hamano	Merge branch 'rs/rebase'	commit \| commitdiff \| tree
2006-08-01	Junio C Hamano	Merge branch 'ml/pager'	commit \| commitdiff \| tree
2006-08-01	Junio C Hamano	Merge branch 'jc/checkout'	commit \| commitdiff \| tree
2006-07-31	Matthias Lederhofer	pager: environment variable GIT_PAGER to override PAGER Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-31	Matthias Lederhofer	pager: config variable pager.color Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-31	Junio C Hamano	Builtins: control the use of pager from the command... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-31	Linus Torvalds	Fix up some fallout from "setup_git_directory()" cleanups Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-31	Linus Torvalds	Fix double "close()" in ce_compare_data Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-31	Junio C Hamano	git-checkout: allow "checkout HEAD -- path" Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-31	Robert Shearman	rebase: Make the fast-fowarding message more user-friendly... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-31	Robert Shearman	rebase: Fix the detection of fast-forwarding of the... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-31	Johannes Schindelin	tar-tree: illustrate an obscure feature better Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-31	Matthias Lederhofer	git.c: allow alias expansion without a git directory Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-31	Matthias Lederhofer	setup_git_directory_gently: do not barf when GIT_DIR... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-30	Gerrit Pape	Build on Debian GNU/kFreeBSD Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-30	Junio C Hamano	Merge branch 'lt/web'	commit \| commitdiff \| tree
2006-07-30	Junio C Hamano	Merge branch '__/setup-n-mv'	commit \| commitdiff \| tree
2006-07-30	Junio C Hamano	Merge branch 'js/mv'	commit \| commitdiff \| tree
2006-07-30	Junio C Hamano	Merge branch 'jn/make'	commit \| commitdiff \| tree
2006-07-29	Junio C Hamano	Merge branch 'lt/setup' into __/setup-n-mv Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
next

Git mergetool

RSS Atom