Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.c

2010-10-27	Merge branch 'jf/merge-ignore-ws'	blob \| diff \| raw
2010-10-27	Merge branch 'ml/completion-zsh'	blob \| diff \| raw \| diff to current
2010-10-27	Merge branch 'po/sendemail'	blob \| diff \| raw \| diff to current
2010-10-27	Merge branch 'en/tree-walk-optim'	blob \| diff \| raw \| diff to current
2010-10-21	merge-recursive:make_room_for_directories - work around...	blob \| diff \| raw \| diff to current
2010-10-06	Merge branch 'mg/reset-doc'	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Remove redundant path clearing for...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Make room for directories in D/F conflicts	blob \| diff \| raw \| diff to current
2010-09-30	handle_delete_modify(): Check whether D/F conflicts...	blob \| diff \| raw \| diff to current
2010-09-30	merge_content(): Check whether D/F conflicts are still...	blob \| diff \| raw \| diff to current
2010-09-30	conflict_rename_rename_1to2(): Fix checks for presence...	blob \| diff \| raw \| diff to current
2010-09-30	conflict_rename_delete(): Check whether D/F conflicts...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Delay modify/delete conflicts if D...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Delay content merging for renames	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Delay handling of rename/delete conflicts	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Move handling of double rename of...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Move handling of double rename of...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Avoid doubly merging rename/add confli...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Update merge_content() call signature	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Update conflict_rename_rename_1to2...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Structure process_df_entry() to handle...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Have process_entry() skip D/F or renam...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: New function to assist resolving renam...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: New data structures for deferring...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Move process_entry's content merging...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Move delete/modify handling into dedic...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Move rename/delete handling into dedic...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Nuke rename/directory conflict detection	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Rename conflict_rename_rename*() for...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Small code clarification -- variable...	blob \| diff \| raw \| diff to current
2010-09-30	merge-recursive: Restructure showing how to chain more...	blob \| diff \| raw \| diff to current
2010-09-30	Merge branch 'en/rename-d-f' into en/merge-recursive	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'tr/send-email-refuse-sending-unedited...	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'ab/send-email-catfile'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'jc/grep-header-all-match-fix'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'jc/no-branch-name-with-dash-at-front'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'jn/gitweb-test-lib'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'bc/fortran-userdiff'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'jk/read-tree-empty'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'rr/format-patch-count-without-merges'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'jc/pickaxe-grep'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'gb/shell-ext'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'rr/fmt-merge-msg'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'po/etc-gitattributes'	blob \| diff \| raw \| diff to current
2010-09-29	merge-recursive: option to specify rename threshold	blob \| diff \| raw \| diff to current
2010-09-18	Merge branch 'js/ls-files-x-doc'	blob \| diff \| raw \| diff to current
2010-09-16	Merge branch 'bg/fix-t7003'	blob \| diff \| raw \| diff to current
2010-09-15	Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'	blob \| diff \| raw \| diff to current
2010-09-15	Merge branch 'os/fix-rebase-diff-no-prefix'	blob \| diff \| raw \| diff to current
2010-09-15	Merge branch 'jl/fix-test'	blob \| diff \| raw \| diff to current
2010-09-15	Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'	blob \| diff \| raw \| diff to current
2010-09-15	Merge branch 'ch/maint-cannot-create-bundle-error'	blob \| diff \| raw \| diff to current
2010-09-15	Merge branch 'ks/recursive-rename-add-identical'	blob \| diff \| raw \| diff to current
2010-09-15	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2010-09-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-09-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-09-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-09-10	merge-recursive: D/F conflicts where was_a_dir/file...	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'tf/cleanup-builtin-help-headers'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'jk/test-must-fail-missing'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'jh/error-removing-missing-note'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'kf/askpass-config'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'bc/maint-fetch-url-only'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'jk/maint-pass-c-config-in-env'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'en/d-f-conflict-fix'	blob \| diff \| raw \| diff to current
2010-09-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-09-06	Merge branch 'jh/clean-exclude'	blob \| diff \| raw \| diff to current
2010-09-06	Merge branch 'jl/maint-fix-test'	blob \| diff \| raw \| diff to current
2010-09-06	Merge branch 'maint' v1.7.3-rc0	blob \| diff \| raw \| diff to current
2010-09-06	Merge branch 'xx/trivial' into maint	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'jl/submodule-ignore-diff'	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'ab/test-2'	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'js/detached-stash'	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'js/maint-reflog-beyond-horizon'	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'dg/local-mod-error-messages'	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'nd/maint-fix-replace'	blob \| diff \| raw \| diff to current
2010-09-03	RE: [PATCH] Avoid rename/add conflict when contents...	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'ab/compat-regex'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'nd/clone-depth-zero'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jn/maint-doc-user-manual-html-doctype'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'cb/maint-mergetool-no-tty'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jn/apply-filename-with-sp'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jn/merge-custom-no-trivial'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jc/maint-doc-em-dash'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'mg/doc-bundle'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jn/doc-backslash'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jn/update-contrib-example-merge'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jn/merge-renormalize'	blob \| diff \| raw \| diff to current
2010-09-03	Sync with 1.7.2.3	blob \| diff \| raw \| diff to current
2010-09-03	setup_unpack_trees_porcelain: take the whole options...	blob \| diff \| raw \| diff to current
2010-09-03	Move set_porcelain_error_msgs to unpack-trees.c and...	blob \| diff \| raw \| diff to current
2010-09-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-09-01	Merge branch 'gp/pack-refs-remove-empty-dirs' into...	blob \| diff \| raw \| diff to current
2010-09-01	Merge branch 'sg/rerere-gc-old-still-used' into maint	blob \| diff \| raw \| diff to current
2010-09-01	Merge branch 'en/rebase-against-rebase-fix' into maint	blob \| diff \| raw \| diff to current
2010-08-31	Merge branch 'np/maint-huge-delta-generation'	blob \| diff \| raw \| diff to current
2010-08-31	Merge branch 'da/fix-submodule-sync-superproject-config'	blob \| diff \| raw \| diff to current
2010-08-31	Merge branch 'jn/cherry-revert-message-clean-up'	blob \| diff \| raw \| diff to current
2010-08-31	Merge branch 'cb/binary-patch-id'	blob \| diff \| raw \| diff to current
2010-08-31	Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'	blob \| diff \| raw \| diff to current
next