git.tokkee.org Git - git.git/search

2008-08-31	Junio C Hamano	merge.conflictstyle: choose between "merge" and "diff3... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-31	Junio C Hamano	rerere: understand "diff3 -m" style conflicts with... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-31	Junio C Hamano	rerere.c: use symbolic constants to keep track of parsing... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-31	Junio C Hamano	xmerge.c: "diff3 -m" style clips merge reduction level... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-31	Junio C Hamano	xmerge.c: minimum readability fixups Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-31	Junio C Hamano	xdiff-merge: optionally show conflicts in "diff3 -m... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-31	Junio C Hamano	xdl_fill_merge_buffer(): separate out a too deeply... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-29	Paolo Ciarrocchi	tutorial: gentler illustration of Alice/Bob workflow... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-29	Jeff King	pretty=format: respect date format options Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-29	Paolo Bonzini	make git-shell paranoid about closed stdin/stdout/stderr Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-29	Yann Dirson	Document gitk --argscmd flag. Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-29	Linus Torvalds	Fix '--dirstat' with cross-directory renaming Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-29	Björn Steinbrink	for-each-ref: Allow a trailing slash in the patterns Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-27	Junio C Hamano	ctype.c: protect tiny C preprocessor constants Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-27	Linus Torvalds	index-pack: be careful after fixing up the header/footer Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-26	Nguyễn Thái Ngọc Duy	index-pack: setup git repository Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-26	Ramsay Jones	Suppress some bash redirection error messages Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-26	Ramsay Jones	Fix a warning (on cygwin) to allow -Werror Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-25	Jeff King	Fix "git log -i --grep" Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-24	Junio C Hamano	GIT 1.6.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-24	Junio C Hamano	Merge branch 'ag/maint-combine-diff-fix' into maint	commit \| commitdiff \| tree
2008-08-24	Junio C Hamano	Merge branch 'mv/maint-merge-fix' into maint	commit \| commitdiff \| tree
2008-08-24	Jonathan Nieder	Documentation: clarify pager configuration Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-24	Jonathan Nieder	Documentation: clarify pager.<cmd> configuration Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-24	Simon Hausmann	Clean up the git-p4 documentation Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-24	Alexander Gavrilov	Respect core.autocrlf in combined diff Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-24	Miklos Vajna	Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-24	Junio C Hamano	merge: fix numerus bugs around "trivial merge" area Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-24	Junio C Hamano	unpack_trees(): protect the handcrafted in-core index... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-23	Tor Arvid Lund	git-p4: Fix one-liner in p4_write_pipe function. Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-22	Eric Raible	Completion: add missing '=' for 'diff --diff-filter' Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-22	Miklos Vajna	Fix 'git help help' Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-21	Brandon Casey	compat/snprintf.c: handle snprintf's that always return... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-21	Eric Wong	git-svn: fix dcommit to urls with embedded usernames Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-21	Brandon Casey	revision.h: make show_early_output an extern which... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-20	Junio C Hamano	Update draft release notes for 1.6.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-20	Tarmigan Casebolt	Add hints to revert documentation about other ways... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-20	Johannes Sixt	Install templates with the user and group of the installing... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-20	Junio C Hamano	"git-merge": allow fast-forwarding in a stat-dirty... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-20	Junio C Hamano	completion: find out supported merge strategies correctly Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-20	Jeff King	decorate: allow const objects to be decorated Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-20	Junio C Hamano	for-each-ref: cope with tags with incomplete lines Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-20	Junio C Hamano	diff --check: do not get confused by new blank lines... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-20	Jim Meyering	remote.c: remove useless if-before-free test Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-20	Jeff King	mailinfo: avoid violating strbuf assertion Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-20	Jim Meyering	git format-patch: avoid underrun when format.headers... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-19	Brandon Casey	t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-19	Robert Schiele	adapt git-cvsserver manpage to dash-free syntax Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-19	Don Zickus	mailinfo: re-fix MIME multipart boundary parsing Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-17	Junio C Hamano	Start 1.6.0.X maintenance series Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-17	Junio C Hamano	GIT 1.6.0 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-17	Junio C Hamano	Merge git-gui 0.11.0	commit \| commitdiff \| tree
2008-08-17	Junio C Hamano	Merge branch 'ak/p4'	commit \| commitdiff \| tree
2008-08-17	Robert Blum	git-p4: chdir now properly sets PWD environment variable... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-17	Stephan Beyer	Improve error output of git-rebase Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-17	Miklos Vajna	t9300: replace '!' with test_must_fail Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-17	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	commit \| commitdiff \| tree
2008-08-16	Marcus Griep	Git.pm: Make File::Spec and File::Temp requirement... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-16	Miklos Vajna	Documentation: document the pager.* configuration setting Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-16	Stephan Beyer	git-stash: improve synopsis in help and manual page Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-16	Eric Blake	Makefile: building git in cygwin 1.7.0 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-16	Stephan Beyer	git-am: ignore --binary option Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-16	Marcus Griep	bash-completion: Add non-command git help files to... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-15	Alex Riesen	Fix t3700 on filesystems which do not support question... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-15	Anand Kumria	Utilise our new p4_read_pipe and p4_write_pipe wrappers Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-15	Anand Kumria	Add p4 read_pipe and write_pipe wrappers Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-15	Lee Marlow	bash completion: Add '--merge' long option for 'git... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-15	Lee Marlow	bash completion: Add completion for 'git mergetool' Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-15	Matt McCutchen	git format-patch documentation: clarify what --cover... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-15	Eric Raible	bash completion: 'git apply' should use 'fix' not ... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-14	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2008-08-14	Brandon Casey	t5304-prune: adjust file mtime based on system time... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-14	Brandon Casey	test-parse-options: use appropriate cast in length_callback Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-14	Kevin Ballard	Fix escaping of glob special characters in pathspecs Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-13	Thomas Rast	rebase -i -p: fix parent rewriting	commit \| commitdiff \| tree
2008-08-13	Thomas Rast	rebase -i -p: handle index and workdir correctly	commit \| commitdiff \| tree
2008-08-13	Junio C Hamano	GIT 1.6.0-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-13	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2008-08-13	Junio C Hamano	Do not talk about "diff" in rev-list documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-13	Junio C Hamano	Merge git://git.bogomips.org/git-svn	commit \| commitdiff \| tree
2008-08-13	Thomas Rast	Documentation: rev-list-options: Rewrite simplification... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Gustaf Hendeby	Teach git diff about BibTeX head hunk patterns Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Gustaf Hendeby	gitattributes: Document built in hunk header patterns Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Stephen R. van den...	git-daemon: SysV needs the signal handler reinstated. Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Junio C Hamano	diff --check: do not unconditionally complain about... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2008-08-12	Anand Kumria	Put in the two other configuration elements found in... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Anand Kumria	Put some documentation in about the parameters that... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Anand Kumria	Move git-p4.syncFromOrigin into a configuration parameters... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Anand Kumria	Consistently use 'git-p4' for the configuration entries Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Anand Kumria	If the user has configured various parameters, use... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Anand Kumria	Switch to using 'p4_build_cmd' Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Anand Kumria	If we are in verbose mode, output what we are about... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Anand Kumria	Add a single command that will be used to construct... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Anand Kumria	Utilise the new 'p4_system' function. Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Anand Kumria	Have a command that specifically invokes 'p4' (via... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Anand Kumria	Utilise the new 'p4_read_pipe_lines' command Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Anand Kumria	Create a specific version of the read_pipe_lines command... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Thomas Rast	Documentation: rev-list-options: Fix a typo Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2008-08-12	Petr Baudis	Adjust for the new way of enabling the default post... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
next

Git - the stupid content tracker

RSS Atom

tokkee.org

Code