git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - merge-recursive.c

projects / thirdparty / git.git / history

[thirdparty/git.git] / merge-recursive.c

2011-08-14	Elijah Newren	merge-recursive: add handling for rename/rename/add...	blob \| commitdiff \| raw
2011-08-14	Elijah Newren	merge-recursive: Have conflict_rename_delete reuse...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Make modify/delete handling code reusable	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Consider modifications in rename/renam...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Create function for merging with branc...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Record more data needed for merging...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Defer rename/rename(2to1) handling...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Small cleanups for conflict_rename_ren...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Fix rename/rename(1to2) resolution...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Introduce a merge_file convenience...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Fix modify/delete resolution in the...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: When we detect we can skip an update...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Provide more info in conflict markers...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Cleanup and consolidation of rename_co...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Consolidate process_entry() and proces...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Improve handling of rename target...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Add comments about handling rename...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Make dead code for rename/rename(2to1...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Fix deletion of untracked file in...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Split update_stages_and_entry; only...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Allow make_room_for_path() to remove...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Split was_tracked() out of would_lose_...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Save D/F conflict filenames instead...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Fix code checking for D/F conflicts...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Fix sorting order and directory change...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Fix recursive case with D/F conflict...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Avoid working directory changes during...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Remember to free generated unique...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Consolidate different update_stages...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Mark some diff_filespec struct argumen...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Correct a comment	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Make BUG message more legible by addin...	blob \| commitdiff \| raw \| diff to current
2011-06-01	Junio C Hamano	Merge branch 'jk/maint-config-alias-fix' into maint	blob \| commitdiff \| raw \| diff to current
2011-06-01	Junio C Hamano	Merge branch 'jc/fmt-req-fix' into maint	blob \| commitdiff \| raw \| diff to current
2011-06-01	Junio C Hamano	Merge branch 'jk/maint-docs' into maint	blob \| commitdiff \| raw \| diff to current
2011-06-01	Junio C Hamano	Merge branch 'jn/doc-remote-helpers' into maint	blob \| commitdiff \| raw \| diff to current
2011-06-01	Junio C Hamano	Merge branch 'kk/maint-prefix-in-config-mak' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-31	Junio C Hamano	Merge branch 'tr/add-i-no-escape' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-31	Junio C Hamano	Merge branch 'vh/config-interactive-singlekey-doc'...	blob \| commitdiff \| raw \| diff to current
2011-05-31	Junio C Hamano	Merge branch 'ml/test-readme' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-31	Junio C Hamano	Merge branch 'ab/i18n-fixup' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-31	Junio C Hamano	Merge branch 'jc/rename-degrade-cc-to-c' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-31	Junio C Hamano	Merge branch 'rr/doc-content-type' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-30	Junio C Hamano	Merge branch 'jm/maint-misc-fix' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-30	Junio C Hamano	Merge branch 'jn/run-command-error-failure' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'maint-1.7.4' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'jk/git-connection-deadlock-fix' into...	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'jm/maint-diff-words-with-sbe' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'kk/maint-prefix-in-config-mak' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'mg/diff-uiconfig-doc' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'ft/gitweb-tar-with-gzip-n' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'ss/doc-svn' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'jn/format-patch-doc' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'jc/maint-pathspec-stdin-and-cmdline'...	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'rg/copy-gecos-username' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'fc/completion-zsh' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'jk/git-connection-deadlock-fix' into...	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...	blob \| commitdiff \| raw \| diff to current
2011-05-26	Junio C Hamano	Merge branch 'svn-fe-maint' of git://repo.or.cz/git...	blob \| commitdiff \| raw \| diff to current
2011-05-17	Junio C Hamano	Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...	blob \| commitdiff \| raw \| diff to current
2011-05-16	Junio C Hamano	Merge branch 'jn/maint-format-patch-doc' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-16	Junio C Hamano	Merge branch 'ss/cherry-pick-x-doc' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-16	Junio C Hamano	Merge branch 'vr/merge-base-doc' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-16	Junio C Hamano	Merge branch 'sr/maint-fast-import-tighten-option-parsi...	blob \| commitdiff \| raw \| diff to current
2011-05-16	Junio C Hamano	Merge branch 'jc/t1506-shell-param-expansion-gotcha...	blob \| commitdiff \| raw \| diff to current
2011-05-16	Junio C Hamano	Merge branch 'jc/fix-add-u-unmerged' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-16	Junio C Hamano	Merge branch 'jn/gitweb-dependency' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-16	Junio C Hamano	Merge branch 'jc/maint-branch-mergeoptions' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-16	Junio C Hamano	Merge branch 'jc/maint-add-p-overlapping-hunks' into...	blob \| commitdiff \| raw \| diff to current
2011-05-15	Junio C Hamano	Merge branch 'cn/format-patch-quiet' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-15	Junio C Hamano	Merge branch 'jm/mergetool-submodules' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-15	Junio C Hamano	Merge branch 'jk/format-patch-quote-special-in-from...	blob \| commitdiff \| raw \| diff to current
2011-05-15	Junio C Hamano	Merge branch 'vh/git-svn-doc' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-15	Jonathan Nieder	add, merge, diff: do not use strcasecmp to compare...	blob \| commitdiff \| raw \| diff to current
2011-05-13	Junio C Hamano	Merge branch 'aw/maint-rebase-i-p-no-ff' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-13	Junio C Hamano	Merge branch 'gr/cvsimport-alternative-cvspass-location...	blob \| commitdiff \| raw \| diff to current
2011-05-13	Junio C Hamano	Merge branch 'jk/merge-one-file-working-tree' into...	blob \| commitdiff \| raw \| diff to current
2011-05-13	Junio C Hamano	Merge branch 'jc/fix-diff-files-unmerged' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-13	Junio C Hamano	Merge branch 'mz/maint-rename-unmerged' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-11	Junio C Hamano	Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'	blob \| commitdiff \| raw \| diff to current
2011-05-11	Junio C Hamano	Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'	blob \| commitdiff \| raw \| diff to current
2011-05-05	Junio C Hamano	Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...	blob \| commitdiff \| raw \| diff to current
2011-05-04	Junio C Hamano	Merge branch 'jh/dirstat' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-04	Junio C Hamano	Merge branch 'sp/maint-clear-postfields' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-04	Junio C Hamano	Merge branch 'jk/maint-stash-oob' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-04	Junio C Hamano	Merge branch 'jk/maint-upload-pack-shallow' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-04	Junio C Hamano	Merge branch 'jc/pack-objects-bigfile' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-04	Junio C Hamano	Merge branch 'mg/reflog-with-options' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-04	Junio C Hamano	Merge branch 'ar/clean-rmdir-empty' into maint	blob \| commitdiff \| raw \| diff to current
2011-05-04	Junio C Hamano	Merge branch 'mg/sha1-path-advise' into maint	blob \| commitdiff \| raw \| diff to current
2011-04-29	Junio C Hamano	Merge branch 'mg/x-years-12-months' into maint	blob \| commitdiff \| raw \| diff to current
2011-04-25	Junio C Hamano	Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...	blob \| commitdiff \| raw \| diff to current
2011-04-19	Junio C Hamano	Sync with 1.7.4.5	blob \| commitdiff \| raw \| diff to current
2011-04-15	Junio C Hamano	Merge v1.7.5-rc2 into jn/format-patch-doc	blob \| commitdiff \| raw \| diff to current
2011-04-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2011-04-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2011-04-13	Junio C Hamano	Merge branch 'jc/rev-list-options-fix' into maint	blob \| commitdiff \| raw \| diff to current
2011-04-13	Junio C Hamano	Merge branch 'js/checkout-untracked-symlink' into maint	blob \| commitdiff \| raw \| diff to current
2011-04-12	Junio C Hamano	Merge branch 'js/checkout-untracked-symlink'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom