Public Git Hosting - git/jnareb-git.git/search

2011-03-18	Junio C Hamano	merge-recursive: tweak magic band-aid Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-03-02	Elijah Newren	merge-recursive: When we detect we can skip an update... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-03-02	Elijah Newren	t6022: New test checking for unnecessary updates of... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-03-02	Elijah Newren	t6022: New test checking for unnecessary updates of... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-11-17	Brian Gernhardt	t6022: Use -eq not = to test output of wc -l Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-10-21	Junio C Hamano	merge-recursive:make_room_for_directories - work around... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Remove redundant path clearing for... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Make room for directories in D/F conflicts Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	handle_delete_modify(): Check whether D/F conflicts... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge_content(): Check whether D/F conflicts are still... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	conflict_rename_rename_1to2(): Fix checks for presence... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	conflict_rename_delete(): Check whether D/F conflicts... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Delay modify/delete conflicts if D... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Delay content merging for renames Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Delay handling of rename/delete conflicts Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Move handling of double rename of... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Move handling of double rename of... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Avoid doubly merging rename/add conflict... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Update merge_content() call signature Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Update conflict_rename_rename_1to2... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Structure process_df_entry() to handle... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Have process_entry() skip D/F or rename... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: New function to assist resolving renames... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: New data structures for deferring... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Move process_entry's content merging... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Move delete/modify handling into dedicated... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Move rename/delete handling into dedicated... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Nuke rename/directory conflict detection Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Rename conflict_rename_rename*() for... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	merge-recursive: Small code clarification -- variable... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	t6036: Add testcase for undetected conflict Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	t6036: Add a second testcase similar to the first but... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	t6036: Test index and worktree state, not just that... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	t6020: Add a testcase for modify/delete + directory... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	t6020: Modernize style a bit Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	t6022: Add tests for rename/rename combined with D... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	t6022: Add paired rename+D/F conflict: (two/file, one... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	t6022: Add tests with both rename source & dest involved... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	t6022: Add tests for reversing order of merges when... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	t6022: Add test combinations of {content conflict?... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Elijah Newren	t6032: Add a test checking for excessive output from... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Junio C Hamano	merge-recursive: Restructure showing how to chain more... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Schalk, Ken	t3030: Add a testcase for resolvable rename/add conflict... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-30	Junio C Hamano	Merge branch 'en/rename-d-f' into en/merge-recursive	commit \| commitdiff \| tree
2010-09-18	Junio C Hamano	Git 1.7.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-18	Junio C Hamano	Merge branch 'js/ls-files-x-doc'	commit \| commitdiff \| tree
2010-09-17	Chris Johnsen	git-rebase--interactive.sh: replace cut with ${v%% *} Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-17	Brandon Casey	t/t7300: workaround ancient touch by rearranging arguments Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-16	Junio C Hamano	Merge branch 'bg/fix-t7003'	commit \| commitdiff \| tree
2010-09-16	Junio C Hamano	ls-files documentation: reword for consistency Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-16	Jay Soffian	git-ls-files.txt: clarify -x/--exclude option Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-15	Junio C Hamano	Git 1.7.3 rc2	commit \| commitdiff \| tree
2010-09-15	Junio C Hamano	Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'	commit \| commitdiff \| tree
2010-09-15	Junio C Hamano	Merge branch 'os/fix-rebase-diff-no-prefix'	commit \| commitdiff \| tree
2010-09-15	Junio C Hamano	Merge branch 'jl/fix-test'	commit \| commitdiff \| tree
2010-09-15	Junio C Hamano	Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'	commit \| commitdiff \| tree
2010-09-15	Junio C Hamano	Merge branch 'ch/maint-cannot-create-bundle-error'	commit \| commitdiff \| tree
2010-09-15	Junio C Hamano	Merge branch 'ks/recursive-rename-add-identical'	commit \| commitdiff \| tree
2010-09-15	Junio C Hamano	Merge git://repo.or.cz/git-gui	commit \| commitdiff \| tree
2010-09-13	Brian Gernhardt	t7003: Use test_commit instead of custom function Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-12	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2010-09-12	Junio C Hamano	ls-tree $di $dir: do not mistakenly recurse into directories Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-12	Junio C Hamano	t3101: modernise style Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-12	Ramsay Jones	vcs-svn: Fix some printf format compiler warnings Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-11	René Scharfe	compat/nedmalloc: don't force NDEBUG on the rest of git Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-10	Junio C Hamano	Git 1.7.3 rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-10	Junio C Hamano	Merge branch 'np/relnotes-in-subdir'	commit \| commitdiff \| tree
2010-09-10	Junio C Hamano	Prepare for 1.7.3 rc1	commit \| commitdiff \| tree
2010-09-10	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2010-09-10	Mark Lodato	config.txt: fix placement of diff.noprefix Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-10	Brandon Casey	t/t4018: avoid two unnecessary sub-shell invocations Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-10	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2010-09-10	Brandon Casey	t/t4018: test whether the word_regex patterns compile Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-10	Brandon Casey	xdiff-interface.c: always trim trailing space from... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-10	Brandon Casey	diff.c: call regfree to free memory allocated by regcomp... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-10	Brandon Casey	t/t5510-fetch.sh: improve testing with explicit URL... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-10	Brandon Casey	builtin/fetch.c: comment that branch->remote_name is... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-10	Brandon Casey	Makefile: use compat regex on IRIX 6.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-10	Brandon Casey	t/t7008: workaround broken handling of \000 by printf... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-10	Oded Shimon	Add --src/dst-prefix to git-formt-patch in git-rebase.sh Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-10	Elijah Newren	merge-recursive: D/F conflicts where was_a_dir/file... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-10	Elijah Newren	t3509: Add rename + D/F conflict testcase that recursive... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-09	Junio C Hamano	install-webdoc: keep installed RelNotes-*.txt Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-09	Jens Lehmann	t1020: Get rid of 'cd "$HERE"' at the start of each... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-09	Jonathan Nieder	t2016 (checkout -p): add missing && Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-09	Jonathan Nieder	t1302 (core.repositoryversion): style tweaks Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-09	Jonathan Nieder	t2105 (gitfile): add missing && Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-09	Jonathan Nieder	t1450 (fsck): remove dangling objects Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-09	Jonathan Nieder	tests: subshell indentation stylefix Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-08	Junio C Hamano	Merge branch 'tf/cleanup-builtin-help-headers'	commit \| commitdiff \| tree
2010-09-08	Junio C Hamano	Merge branch 'jk/test-must-fail-missing'	commit \| commitdiff \| tree
2010-09-08	Junio C Hamano	Merge branch 'jh/error-removing-missing-note'	commit \| commitdiff \| tree
2010-09-08	Junio C Hamano	Merge branch 'kf/askpass-config'	commit \| commitdiff \| tree
2010-09-08	Junio C Hamano	Merge branch 'bc/maint-fetch-url-only'	commit \| commitdiff \| tree
2010-09-08	Junio C Hamano	Merge branch 'jk/maint-pass-c-config-in-env'	commit \| commitdiff \| tree
2010-09-08	Junio C Hamano	Merge branch 'en/d-f-conflict-fix'	commit \| commitdiff \| tree
2010-09-08	Johannes Sixt	fast-export: ensure that a renamed file is printed... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-07	Nicolas Pitre	Documentation: move RelNotes into a directory of their own Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-09-07	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2010-09-07	Elijah Newren	revert: Fix trivial comment style issue Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
next

git with Jakub Narębski modifications

RSS Atom