asedeno.scripts.mit.edu Git - git.git/history

]> asedeno.scripts.mit.edu Git - git.git/history - merge-recursive.c

2010-11-30	Junio C Hamano	Merge branch 'en/merge-recursive'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'jn/cherry-pick-refresh-index'	blob \| commitdiff \| raw \| diff to current
2010-11-30	Junio C Hamano	Merge branch 'jc/emfile'	blob \| commitdiff \| raw \| diff to current
2010-11-30	Junio C Hamano	Merge branch 'jl/add-p-reverse-message'	blob \| commitdiff \| raw \| diff to current
2010-11-30	Junio C Hamano	Merge branch 'np/pack-broken-boundary'	blob \| commitdiff \| raw \| diff to current
2010-11-30	Junio C Hamano	Merge branch 'np/diff-in-corrupt-repository'	blob \| commitdiff \| raw \| diff to current
2010-11-30	Junio C Hamano	Merge branch 'fc/apply-p2-get-header-name'	blob \| commitdiff \| raw \| diff to current
2010-11-30	Junio C Hamano	Merge branch 'jn/fast-import-fix'	blob \| commitdiff \| raw \| diff to current
2010-11-30	Junio C Hamano	Merge branch 'kb/blame-author-email'	blob \| commitdiff \| raw \| diff to current
2010-11-30	Junio C Hamano	Merge branch 'cm/diff-check-at-eol'	blob \| commitdiff \| raw \| diff to current
2010-11-30	Junio C Hamano	Merge branch 'ak/apply-non-git-epoch'	blob \| commitdiff \| raw \| diff to current
2010-11-30	Junio C Hamano	Merge branch 'tc/smart-http-post-redirect'	blob \| commitdiff \| raw \| diff to current
2010-11-26	Junio C Hamano	Merge branch 'en/and-cascade-tests'	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'cb/maint-orphan-merge-noclobber'	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'jk/add-e-doc'	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'kb/maint-rebase-autosquash'	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'en/and-cascade-tests'	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'cb/diff-fname-optim' into maint	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'jk/no-textconv-symlink' into maint	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'aw/git-p4-deletion' into maint	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'kf/post-receive-sample-hook' into maint	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'mg/reset-doc' into maint	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'tr/send-email-refuse-sending-unedited...	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jl/maint-pull-tags-doc'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'kb/maint-submodule-savearg'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jk/missing-config'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'kb/maint-diff-ws-check'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'bg/maint-gitweb-test-lib'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jm/mailmap'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'tr/maint-git-repack-tmpfile'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jk/maint-apply-no-binary'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jk/push-progress'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'tr/maint-merge-file-subdir'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jn/send-pack-error'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'mg/make-prove'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'kb/completion-checkout'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'sg/completion'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'sg/bisect'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'ak/submodule-sync'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jk/maint-rev-list-nul'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'ks/no-textconv-symlink'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jn/gitweb-test'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'cb/diff-fname-optim'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jk/no-textconv-symlink'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'dk/maint-blame-el'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-11-15	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-11-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-11-05	Junio C Hamano	Merge branch 'aw/git-p4-deletion'	blob \| commitdiff \| raw \| diff to current
2010-11-05	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2010-11-05	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'ab/send-email-perl'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'sb/send-email-use-to-from-input'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'ab/require-perl-5.8'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'kb/merge-recursive-rename-threshold'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'jp/send-email-to-cmd'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'as/daemon-multi-listen'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'dm/mergetool-vimdiff'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'kf/post-receive-sample-hook'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'jf/merge-ignore-ws'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'ml/completion-zsh'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'po/sendemail'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'en/tree-walk-optim'	blob \| commitdiff \| raw \| diff to current
2010-10-21	Junio C Hamano	merge-recursive:make_room_for_directories - work around...	blob \| commitdiff \| raw \| diff to current
2010-10-06	Junio C Hamano	Merge branch 'mg/reset-doc'	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Remove redundant path clearing for...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Make room for directories in D/F conflicts	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	handle_delete_modify(): Check whether D/F conflicts...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge_content(): Check whether D/F conflicts are still...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	conflict_rename_rename_1to2(): Fix checks for presence...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	conflict_rename_delete(): Check whether D/F conflicts...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Delay modify/delete conflicts if D...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Delay content merging for renames	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Delay handling of rename/delete conflicts	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Move handling of double rename of...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Move handling of double rename of...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Avoid doubly merging rename/add confli...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Update merge_content() call signature	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Update conflict_rename_rename_1to2...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Structure process_df_entry() to handle...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Have process_entry() skip D/F or renam...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: New function to assist resolving renam...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: New data structures for deferring...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Move process_entry's content merging...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Move delete/modify handling into dedic...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Move rename/delete handling into dedic...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Nuke rename/directory conflict detection	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Rename conflict_rename_rename*() for...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Elijah Newren	merge-recursive: Small code clarification -- variable...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Junio C Hamano	merge-recursive: Restructure showing how to chain more...	blob \| commitdiff \| raw \| diff to current
2010-09-30	Junio C Hamano	Merge branch 'en/rename-d-f' into en/merge-recursive	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'tr/send-email-refuse-sending-unedited...	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'ab/send-email-catfile'	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'jc/grep-header-all-match-fix'	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'jc/no-branch-name-with-dash-at-front'	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'jn/gitweb-test-lib'	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'bc/fortran-userdiff'	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'jk/read-tree-empty'	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'rr/format-patch-count-without-merges'	blob \| commitdiff \| raw \| diff to current
next

local clone of git.git

RSS Atom