Public Git Hosting - git/mergetool.git/search

2006-07-28	Johannes Schindelin	merge-recur: Get rid of debug code Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-28	Johannes Schindelin	merge-recur: Convert variable names to lower_case Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-28	Johannes Schindelin	Cumulative update of merge-recursive in C Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Junio C Hamano	Merge branch 'lt/unitype' into js/c-merge-recursive	commit \| commitdiff \| tree
2006-07-14	Junio C Hamano	builtin-prune.c: forgot TYPE => OBJ changes. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Junio C Hamano	recur vs recursive: help testing without touching too... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Johannes Schindelin	Status update on merge-recursive in C Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Luben Tuikov	gitweb.css: Use monospace fonts for commits and tree... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Alex Riesen	Do not use perl in git-commit.sh Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Timo Hirvonen	diff: Support 256 colors Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Timo Hirvonen	diff: Support both attributes and colors Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Matthias Lederhofer	Documentation about exclude/ignore files Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Matthias Lederhofer	daemon: new option --detach to run git-daemon in background Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Matthias Lederhofer	daemon: new option --pid-file=<path> to store the pid Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Matthias Lederhofer	upload-pack: ignore write errors to stderr Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Matthias Lederhofer	daemon: if one of the standard fds is missing open... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Matthias Lederhofer	daemon: use a custom die routine with syslog Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Junio C Hamano	Documentation: Fix ssh://[user@]host.xz URL Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Junio C Hamano	Adjust t4013 tests to corrected format-patch. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Robert Shearman	format-patch: Generate a newline between the subject... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Junio C Hamano	t4013 diff format tests update Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Jakub Narebski	Display help for Git mode after pressing `h' or `?... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-14	Jakub Narebski	Wrap long lines in docstrings in contrib/emacs/git.el Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-13	Linus Torvalds	Remove TYPE_* constant macros and use object_type enums... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-13	Junio C Hamano	Merge branch 'ml/trace'	commit \| commitdiff \| tree
2006-07-13	Junio C Hamano	test-lib: unset GIT_TRACE Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-13	Junio C Hamano	git-repack: avoid redirecting stderr into git-pack... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-13	Junio C Hamano	Fix grammatical error in git-revert Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-13	Junio C Hamano	Merge branch 'js/merge-base'	commit \| commitdiff \| tree
2006-07-13	Junio C Hamano	Merge branch 'lt/prune'	commit \| commitdiff \| tree
2006-07-13	Junio C Hamano	Merge branch 'lt/merge-tree'	commit \| commitdiff \| tree
2006-07-13	Junio C Hamano	fmt-merge-msg fix Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-13	Alp Toker	gitweb: Make command invocations go through the git... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-11	Alp Toker	gitweb: Include a site name in page titles Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-11	Alp Toker	gitweb: Send XHTML as 'application/xhtml+xml' where... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-11	Eric Wong	git-fetch: fix a bashism (==) Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-11	Linus Torvalds	Make the unpacked object header functions static to... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-11	Alp Toker	git-send-email: Remove redundant Reply-To header Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-11	Alp Toker	typofix (git-name-rev documentation) Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-11	Yakov Lerner	Mention the [user@] part in documentation of ssh:/... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-11	Eric Wong	tests: Set EDITOR=: and VISUAL=: globally Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-11	Shawn Pearce	Log ref changes made by git-fetch and git-pull. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-11	Shawn Pearce	Record the type of commit operation in the reflog. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-11	Shawn Pearce	Allow user.name and user.email to drive reflog entry. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-10	Johannes Schindelin	Fix linking for not-so-clever linkers. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-10	Matthias Lederhofer	git-rev-list: add documentation for --parents, --no... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-10	Junio C Hamano	Merge branch 'jc/show-merge'	commit \| commitdiff \| tree
2006-07-10	Pavel Roskin	Avoid C99 comments, use old-style C comments instead. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-10	Pavel Roskin	Fix more typos, primarily in the code Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-10	Luben Tuikov	gitweb.cgi: Teach "a=blob" action to know the blob... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-10	Luben Tuikov	gitweb.cgi: Create $git_temp if it doesn't exist Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-10	Junio C Hamano	Merge branch 'lt/gitweb'	commit \| commitdiff \| tree
2006-07-10	Eric Wong	git-svn: fix --file/-F option in commit-diff Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-10	Shawn Pearce	Avoid C99 initializers Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-10	Junio C Hamano	Merge branch 'jc/rename'	commit \| commitdiff \| tree
2006-07-10	Junio C Hamano	Merge branch 'jc/grep'	commit \| commitdiff \| tree
2006-07-10	Junio C Hamano	Merge branch 'jc/mailinfo'	commit \| commitdiff \| tree
2006-07-10	Junio C Hamano	Merge branch 'ew/diff'	commit \| commitdiff \| tree
2006-07-10	Junio C Hamano	Merge branch 'ew/svn'	commit \| commitdiff \| tree
2006-07-09	A Large Angry SCM	Additional merge-base tests (revised)	commit \| commitdiff \| tree
2006-07-09	Junio C Hamano	merge-base: update the clean-up postprocessing Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-09	Alp Toker	Fix typos involving the word 'commit' Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-09	Alp Toker	Fix some doubled word typos Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-09	Alp Toker	Fix some doubled word typos Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-09	Junio C Hamano	"git -p cmd" to page anywhere Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-09	Matthias Lederhofer	change ent to tree in git-diff documentation Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-09	Pavel Roskin	Typofix in Makefile comment. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-09	Pavel Roskin	Assorted typo fixes Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-09	Timo Hirvonen	GIT_TRACE: fix a mixed declarations and code warning Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-09	Matthias Lederhofer	GIT_TRACE: show which built-in/external commands are... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-09	Linus Torvalds	builtin "git prune" Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-09	Luben Tuikov	Add "raw" output option to blobs in "tree" view format Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-09	Junio C Hamano	Merge branch 'sf/diff'	commit \| commitdiff \| tree
2006-07-09	Ryan Anderson	Disable color detection during format-patch Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-09	Peter Baumann	git-cvsexportcommit can't handle merge commits correctly Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-08	Michal Rokos	Using 'perl' in *.sh Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-08	Michal Rokos	sed -e '/RE/r rfile/' needs space in 'r rfile' Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-08	Johannes Schindelin	Close the index file between writing and committing Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-08	Eric Wong	templates/hooks--update: replace diffstat calls with... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-08	Junio C Hamano	diff: do not use configuration magic at the core-level Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-08	Junio C Hamano	colored diff: diff.color = auto fix Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Junio C Hamano	git log -p --merge [[--] paths...] Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Johannes Schindelin	Makefile: export NO_SVN_TESTS Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Junio C Hamano	Update diff-options and config documentation. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Junio C Hamano	diff.c: --no-color to defeat diff.color configuration. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Eric Wong	diff.c: respect diff.renames config option Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Stephan Feder	diff-options: Explain --text and -a Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Stephan Feder	Add -a and --text to common diff options help Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Stephan Feder	Teach diff -a as shorthand for --text Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Stephan Feder	Teach --text option to diff Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Jakub Narebski	send-email: format 2822 datestring ourselves. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Stephan Feder	Do not drop data from '\0' until eol in patch output Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Eric Wong	builtin-log: respect diff configuration options Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Junio C Hamano	git-svn: migrate out of contrib (follow-up) Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Junio C Hamano	rev-parse documentation: talk about range notation. Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Junio C Hamano	show-branch: match documentation and usage Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Junio C Hamano	Merge branch 'js/merge-base'	commit \| commitdiff \| tree
2006-07-07	Junio C Hamano	builtin-rev-parse.c: constness tightening Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Junio C Hamano	diffcore-rename: try matching up renames without populating... Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
2006-07-07	Eric Wong	git-svn: migrate out of contrib Signed-off-by: Junio C Hamano <junkio@cox.net>	commit \| commitdiff \| tree
next

Git mergetool

RSS Atom