projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
enable "no-done" extension only when serving over smart-http
[git] / merge-recursive.c
2010-12-04  Junio C HamanoMerge branch 'pn/commit-autosquash' blob | commitdiff | raw
2010-12-04  Junio C HamanoMerge branch 'sn/diff-doc' blob | commitdiff | raw
2010-12-04  Junio C HamanoMerge branch 'sp/emfile' blob | commitdiff | raw
2010-12-04  Junio C HamanoMerge branch 'jc/abbrev-guard' blob | commitdiff | raw
2010-12-04  Junio C HamanoMerge branch 'jj/icase-directory' blob | commitdiff | raw
2010-12-03  Junio C HamanoMerge branch 'maint' to sync with Git 1.7.3.3 blob | commitdiff | raw
2010-12-02  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2010-12-02  Junio C HamanoPrepare for 1.7.3.3 blob | commitdiff | raw | diff to current
2010-12-02  Junio C HamanoGit 1.7.2.4 v1.7.2.4 blob | commitdiff | raw | diff to current
2010-12-02  Junio C HamanoGit 1.7.1.3 v1.7.1.3 blob | commitdiff | raw | diff to current
2010-12-02  Junio C HamanoMerge branch 'cb/maint-orphan-merge-noclobber' into... blob | commitdiff | raw | diff to current
2010-12-02  Junio C HamanoMerge branch 'ks/no-textconv-symlink' into maint blob | commitdiff | raw | diff to current
2010-12-02  Junio C HamanoMerge branch 'bc/fortran-userdiff' into maint blob | commitdiff | raw | diff to current
2010-12-02  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2010-12-02  Junio C HamanoMerge branch 'maint-1.7.2' into maint blob | commitdiff | raw | diff to current
2010-12-02  Junio C HamanoMerge branch 'maint-1.7.1' into maint-1.7.2 blob | commitdiff | raw | diff to current
2010-12-02  Junio C HamanoMerge branch 'maint-1.7.0' into maint-1.7.1 blob | commitdiff | raw | diff to current
2010-12-01  Junio C HamanoMerge branch 'js/maint-apply-tab-in-indent-fix' into... blob | commitdiff | raw | diff to current
2010-11-30  Junio C HamanoMerge branch 'cb/leading-path-removal' blob | commitdiff | raw
2010-11-30  Junio C HamanoMerge branch 'en/merge-recursive' blob | commitdiff | raw
2010-11-30  Junio C HamanoMerge branch 'jn/cherry-pick-refresh-index' blob | commitdiff | raw | diff to current
2010-11-30  Junio C HamanoMerge branch 'jc/emfile' blob | commitdiff | raw | diff to current
2010-11-30  Junio C HamanoMerge branch 'jl/add-p-reverse-message' blob | commitdiff | raw | diff to current
2010-11-30  Junio C HamanoMerge branch 'np/pack-broken-boundary' blob | commitdiff | raw | diff to current
2010-11-30  Junio C HamanoMerge branch 'np/diff-in-corrupt-repository' blob | commitdiff | raw | diff to current
2010-11-30  Junio C HamanoMerge branch 'fc/apply-p2-get-header-name' blob | commitdiff | raw | diff to current
2010-11-30  Junio C HamanoMerge branch 'jn/fast-import-fix' blob | commitdiff | raw | diff to current
2010-11-30  Junio C HamanoMerge branch 'kb/blame-author-email' blob | commitdiff | raw | diff to current
2010-11-30  Junio C HamanoMerge branch 'cm/diff-check-at-eol' blob | commitdiff | raw | diff to current
2010-11-30  Junio C HamanoMerge branch 'ak/apply-non-git-epoch' blob | commitdiff | raw | diff to current
2010-11-30  Junio C HamanoMerge branch 'tc/smart-http-post-redirect' blob | commitdiff | raw | diff to current
2010-11-26  Junio C HamanoMerge branch 'en/and-cascade-tests' blob | commitdiff | raw | diff to current
2010-11-24  Junio C HamanoMerge branch 'cb/maint-orphan-merge-noclobber' blob | commitdiff | raw | diff to current
2010-11-24  Junio C HamanoMerge branch 'jk/add-e-doc' blob | commitdiff | raw | diff to current
2010-11-24  Junio C HamanoMerge branch 'kb/maint-rebase-autosquash' blob | commitdiff | raw | diff to current
2010-11-24  Junio C HamanoMerge branch 'en/and-cascade-tests' blob | commitdiff | raw | diff to current
2010-11-24  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-11-24  Junio C HamanoMerge branch 'cb/diff-fname-optim' into maint blob | commitdiff | raw | diff to current
2010-11-24  Junio C HamanoMerge branch 'jk/no-textconv-symlink' into maint blob | commitdiff | raw | diff to current
2010-11-24  Junio C HamanoMerge branch 'aw/git-p4-deletion' into maint blob | commitdiff | raw | diff to current
2010-11-24  Junio C HamanoMerge branch 'kf/post-receive-sample-hook' into maint blob | commitdiff | raw | diff to current
2010-11-24  Junio C HamanoMerge branch 'mg/reset-doc' into maint blob | commitdiff | raw | diff to current
2010-11-24  Junio C HamanoMerge branch 'tr/send-email-refuse-sending-unedited... blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'jl/maint-pull-tags-doc' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'kb/maint-submodule-savearg' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'jk/missing-config' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'kb/maint-diff-ws-check' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'bg/maint-gitweb-test-lib' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'jm/mailmap' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'tr/maint-git-repack-tmpfile' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'jk/maint-apply-no-binary' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'jk/push-progress' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'tr/maint-merge-file-subdir' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'jn/send-pack-error' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'mg/make-prove' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'kb/completion-checkout' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'sg/completion' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'sg/bisect' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'ak/submodule-sync' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'jk/maint-rev-list-nul' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'ks/no-textconv-symlink' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'jn/gitweb-test' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'cb/diff-fname-optim' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'jk/no-textconv-symlink' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'dk/maint-blame-el' blob | commitdiff | raw | diff to current
2010-11-17  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-11-15  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-11-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-11-05  Junio C HamanoMerge branch 'aw/git-p4-deletion' blob | commitdiff | raw | diff to current
2010-11-05  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2010-11-05  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-10-27  Junio C HamanoMerge branch 'ab/send-email-perl' blob | commitdiff | raw | diff to current
2010-10-27  Junio C HamanoMerge branch 'sb/send-email-use-to-from-input' blob | commitdiff | raw | diff to current
2010-10-27  Junio C HamanoMerge branch 'ab/require-perl-5.8' blob | commitdiff | raw | diff to current
2010-10-27  Junio C HamanoMerge branch 'kb/merge-recursive-rename-threshold' blob | commitdiff | raw | diff to current
2010-10-27  Junio C HamanoMerge branch 'jp/send-email-to-cmd' blob | commitdiff | raw | diff to current
2010-10-27  Junio C HamanoMerge branch 'as/daemon-multi-listen' blob | commitdiff | raw | diff to current
2010-10-27  Junio C HamanoMerge branch 'dm/mergetool-vimdiff' blob | commitdiff | raw | diff to current
2010-10-27  Junio C HamanoMerge branch 'kf/post-receive-sample-hook' blob | commitdiff | raw | diff to current
2010-10-27  Junio C HamanoMerge branch 'jf/merge-ignore-ws' blob | commitdiff | raw | diff to current
2010-10-27  Junio C HamanoMerge branch 'ml/completion-zsh' blob | commitdiff | raw | diff to current
2010-10-27  Junio C HamanoMerge branch 'po/sendemail' blob | commitdiff | raw | diff to current
2010-10-27  Junio C HamanoMerge branch 'en/tree-walk-optim' blob | commitdiff | raw | diff to current
2010-10-21  Junio C Hamanomerge-recursive:make_room_for_directories - work around... blob | commitdiff | raw | diff to current
2010-10-06  Junio C HamanoMerge branch 'mg/reset-doc' blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenmerge-recursive: Remove redundant path clearing for... blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenmerge-recursive: Make room for directories in D/F conflicts blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenhandle_delete_modify(): Check whether D/F conflicts... blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenmerge_content(): Check whether D/F conflicts are still... blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenconflict_rename_rename_1to2(): Fix checks for presence... blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenconflict_rename_delete(): Check whether D/F conflicts... blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenmerge-recursive: Delay modify/delete conflicts if D... blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenmerge-recursive: Delay content merging for renames blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenmerge-recursive: Delay handling of rename/delete conflicts blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenmerge-recursive: Move handling of double rename of... blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenmerge-recursive: Move handling of double rename of... blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenmerge-recursive: Avoid doubly merging rename/add confli... blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenmerge-recursive: Update merge_content() call signature blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenmerge-recursive: Update conflict_rename_rename_1to2... blob | commitdiff | raw | diff to current
2010-09-30  Elijah Newrenmerge-recursive: Structure process_df_entry() to handle... blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.