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

2011-08-14	Elijah Newren	merge-recursive: Create function for merging with branchname... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Record more data needed for merging... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Defer rename/rename(2to1) handling... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Small cleanups for conflict_rename_rename_1to2 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Fix rename/rename(1to2) resolution... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Introduce a merge_file convenience... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Fix modify/delete resolution in the... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	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-08-14	Elijah Newren	merge-recursive: Provide more info in conflict markers... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Cleanup and consolidation of rename_conflic... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Consolidate process_entry() and process_df_... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Improve handling of rename target... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Add comments about handling rename... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Make dead code for rename/rename(2to1... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Fix deletion of untracked file in... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Split update_stages_and_entry; only... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Allow make_room_for_path() to remove... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Johannes Sixt	string-list: Add API to remove an item from an unsorted... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Split was_tracked() out of would_lose_untra... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Save D/F conflict filenames instead... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Fix code checking for D/F conflicts... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Fix sorting order and directory change... Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Fix recursive case with D/F conflict... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Avoid working directory changes during... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Remember to free generated unique... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Consolidate different update_stages... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Mark some diff_filespec struct arguments... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Correct a comment Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Make BUG message more legible by adding... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6022: Add testcase for merging a renamed file with... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6022: New tests checking for unnecessary updates of... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6022: Remove unnecessary untracked files to make test... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6036: criss-cross + rename/rename(1to2)/add-source... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6036: criss-cross w/ rename/rename(1to2)/modify+rename... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6036: tests for criss-cross merges with various directory... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6036: criss-cross with weird content can fool git... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6036: Add differently resolved modify/delete conflict... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6042: Add failing testcases for rename/rename/add... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6042: Ensure rename/rename conflicts leave index and... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6042: Add tests for content issues with modify/rename... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6042: Add a testcase where undetected rename causes... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6042: Add a pair of cases where undetected renames... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6042: Add failing testcase for rename/modify/add-source... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6042: Add a testcase where git deletes an untracked... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-06-09	Jim Meyering	fetch: do not leak a refspec Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-06-01	Junio C Hamano	Git 1.7.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-06-01	Junio C Hamano	Merge branch 'jk/maint-config-alias-fix' into maint	commit \| commitdiff \| tree
2011-06-01	Junio C Hamano	Merge branch 'jc/fmt-req-fix' into maint	commit \| commitdiff \| tree
2011-06-01	Junio C Hamano	Merge branch 'jk/maint-docs' into maint	commit \| commitdiff \| tree
2011-06-01	Junio C Hamano	Merge branch 'jn/doc-remote-helpers' into maint	commit \| commitdiff \| tree
2011-06-01	Junio C Hamano	Merge branch 'kk/maint-prefix-in-config-mak' into maint	commit \| commitdiff \| tree
2011-06-01	Jim Meyering	diffcore-rename.c: avoid set-but-not-used warning Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-31	Junio C Hamano	Start 1.7.5.4 draft release notes Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-31	Junio C Hamano	Merge branch 'tr/add-i-no-escape' into maint	commit \| commitdiff \| tree
2011-05-31	Junio C Hamano	Merge branch 'vh/config-interactive-singlekey-doc'...	commit \| commitdiff \| tree
2011-05-31	Junio C Hamano	Merge branch 'ml/test-readme' into maint	commit \| commitdiff \| tree
2011-05-31	Junio C Hamano	Merge branch 'ab/i18n-fixup' into maint	commit \| commitdiff \| tree
2011-05-31	Junio C Hamano	Merge branch 'jc/rename-degrade-cc-to-c' into maint	commit \| commitdiff \| tree
2011-05-31	Junio C Hamano	Merge branch 'rr/doc-content-type' into maint	commit \| commitdiff \| tree
2011-05-30	Jonathan Nieder	Documentation: do not misinterpret refspecs as bold... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-30	Junio C Hamano	Merge branch 'jm/maint-misc-fix' into maint	commit \| commitdiff \| tree
2011-05-30	Junio C Hamano	Merge branch 'bc/maint-submodule-fix-parked' into maint	commit \| commitdiff \| tree
2011-05-30	Junio C Hamano	Merge branch 'bc/maint-api-doc-parked' into maint	commit \| commitdiff \| tree
2011-05-30	Junio C Hamano	Merge branch 'jn/run-command-error-failure' into maint	commit \| commitdiff \| tree
2011-05-27	Junio C Hamano	config.mak.in: allow "configure --sysconfdir=/else... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-27	Jeff King	docs: fix some antique example output Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-27	Jeff King	docs: make sure literal "->" isn't converted to arrow Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-27	Jeff King	docs: update status --porcelain format Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-27	Jeff King	docs: minor grammar fixes to git-status Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-26	Brandon Casey	git-submodule.sh: separate parens by a space to avoid... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-26	Brandon Casey	Documentation/technical/api-diff.txt: correct name... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-26	Jeff King	read_gitfile_gently: use ssize_t to hold read result Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-26	Jim Meyering	remove tests of always-false condition Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-26	Jim Meyering	rerere.c: diagnose a corrupt MERGE_RR when hitting... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Git 1.7.5.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'maint-1.7.4' into maint	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'jk/git-connection-deadlock-fix' into...	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'jk/maint-upload-pack-shallow' into maint...	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'jm/maint-diff-words-with-sbe' into maint	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'kk/maint-prefix-in-config-mak' into maint	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'mg/diff-uiconfig-doc' into maint	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'ft/gitweb-tar-with-gzip-n' into maint	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'ss/doc-svn' into maint	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'jn/format-patch-doc' into maint	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'jc/maint-pathspec-stdin-and-cmdline'...	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'jk/cherry-pick-root-with-resolve' into...	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'rg/copy-gecos-username' into maint	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'fc/completion-zsh' into maint	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'jk/git-connection-deadlock-fix' into...	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...	commit \| commitdiff \| tree
2011-05-26	Junio C Hamano	Merge branch 'svn-fe-maint' of git://repo.or.cz/git...	commit \| commitdiff \| tree
2011-05-25	Junio C Hamano	userformat_find_requirements(): find requirement for... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-25	Nguyen Thai Ngoc Duy	init/clone: remove short option -L and document --separate... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-24	Junio C Hamano	handle_options(): do not miscount how many arguments... Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-24	Jeff King	config: always parse GIT_CONFIG_PARAMETERS during git_config Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-24	Jeff King	git_config: don't peek at global config_parameters Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-24	Jeff King	config: make environment parsing routines static Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-20	Jim Meyering	do not read beyond end of malloc'd buffer Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2011-05-20	Michael J Gruber	git-svn: Fix git svn log --show-commit Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
next

Git - the stupid content tracker

RSS Atom

tokkee.org

Code