projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
FIXME: hotpatch for compatibility with latest hg
[git] / merge-recursive.c
2011-08-24  Junio C HamanoMerge branch 'jc/merge-reword' into next blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'nk/branch-v-abbrev' into next blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'hv/submodule-update-none' into next blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'ci/forbid-unwanted-current-branch-update... blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'jc/lookup-object-hash' into next blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'di/fast-import-tagging' into next blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'di/fast-import-blob-tweak' into next blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'va/p4-branch-import' into next blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'va/p4-rename-copy' into next blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'jc/traverse-commit-list' into next blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'nd/maint-clone-gitdir' into next blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'fg/submodule-ff-check-before-push' into... blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'jc/combine-diff-callback' into next blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'jk/pager-with-external-command' into... blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'fk/make-auto-header-dependencies' into... blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'rr/revert-cherry-pick-continue' into... blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'bw/doc-repo-layout' into next blob | commitdiff | raw
2011-08-24  Junio C HamanoMerge branch 'master' into next blob | commitdiff | raw
2011-08-24  Junio C HamanoSync with 1.7.6.1 blob | commitdiff | raw | diff to current
2011-08-23  Junio C HamanoMerge branch 'ac/describe-dirty-refresh' into next blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'jc/maint-clone-alternates' into next blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'fk/use-kwset-pickaxe-grep-f' into next blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'mg/branch-set-upstream-previous' into... blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'da/difftool-mergtool-refactor' into next blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'jc/maint-autofix-tag-in-head' into next blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'di/fast-import-doc' into next blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'rc/diff-cleanup-records' into next blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'di/fast-import-deltified-tree' into next blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'di/fast-import-ident' into next blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'fg/submodule-git-file-git-dir' into next blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'nd/decorate-grafts' into next blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'jk/color-and-pager' into next blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'jn/plug-empty-tree-leak' into next blob | commitdiff | raw
2011-08-23  Junio C HamanoMerge branch 'en/merge-recursive-2' into next blob | commitdiff | raw | diff to current
2011-08-23  Junio C HamanoMerge branch 'mh/attr' into next blob | commitdiff | raw | diff to current
2011-08-23  Junio C HamanoMerge branch 'di/parse-options-split' into next blob | commitdiff | raw | diff to current
2011-08-23  Junio C HamanoMerge branch 'js/i18n-scripts' into next blob | commitdiff | raw | diff to current
2011-08-23  Junio C HamanoMerge branch 'rt/zlib-smaller-window' blob | commitdiff | raw | diff to current
2011-08-23  Junio C HamanoMerge branch 'jn/maint-test-return' blob | commitdiff | raw | diff to current
2011-08-23  Junio C HamanoMerge branch 'cb/maint-ls-files-error-report' blob | commitdiff | raw | diff to current
2011-08-23  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2011-08-23  Junio C HamanoMerge branch 'jc/maint-combined-diff-work-tree' into... blob | commitdiff | raw | diff to current
2011-08-23  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2011-08-19  Junio C HamanoMerge branch 'db/am-skip-blank-at-the-beginning' blob | commitdiff | raw | diff to current
2011-08-19  Junio C HamanoMerge branch 'ma/am-exclude' blob | commitdiff | raw | diff to current
2011-08-19  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2011-08-18  Junio C HamanoMerge branch 'mh/check-attr-relative' blob | commitdiff | raw | diff to current
2011-08-18  Junio C HamanoMerge branch 'js/bisect-no-checkout' blob | commitdiff | raw | diff to current
2011-08-18  Junio C HamanoMerge branch 'rc/histogram-diff' blob | commitdiff | raw | diff to current
2011-08-18  Junio C HamanoMerge branch 'jc/maint-combined-diff-work-tree' blob | commitdiff | raw | diff to current
2011-08-18  Junio C HamanoMerge branch 'rc/histogram-diff' into HEAD blob | commitdiff | raw | diff to current
2011-08-16  Junio C HamanoMerge branch 'master' into next blob | commitdiff | raw | diff to current
2011-08-16  Jonathan Niedermerge-recursive: take advantage of hardcoded empty... blob | commitdiff | raw | diff to current
2011-08-16  Junio C HamanoMerge branch 'jk/tag-list-multiple-patterns' into maint blob | commitdiff | raw | diff to current
2011-08-16  Junio C HamanoMerge branch 'jl/submodule-add-relurl-wo-upstream'... blob | commitdiff | raw | diff to current
2011-08-16  Junio C HamanoMerge branch 'jk/fast-export-quote-path' into maint blob | commitdiff | raw | diff to current
2011-08-16  Junio C HamanoMerge branch 'bw/log-all-ref-updates-doc' into maint blob | commitdiff | raw | diff to current
2011-08-16  Junio C HamanoMerge branch 'js/maint-add-path-stat-pwd' into maint blob | commitdiff | raw | diff to current
2011-08-16  Junio C HamanoMerge branch 'jn/mime-type-with-params' into maint blob | commitdiff | raw | diff to current
2011-08-16  Junio C HamanoMerge branch 'jc/submodule-sync-no-auto-vivify' into... blob | commitdiff | raw | diff to current
2011-08-16  Junio C HamanoMerge branch 'jc/zlib-wrap' into maint blob | commitdiff | raw | diff to current
2011-08-16  Junio C HamanoMerge branch 'bc/submodule-foreach-stdin-fix-1.7.4... blob | commitdiff | raw | diff to current
2011-08-16  Junio C HamanoMerge branch 'jc/diff-index-quick-exit-early' into... blob | commitdiff | raw | diff to current
2011-08-15  Junio C HamanoMerge branch 'cb/maint-ls-files-error-report' into... blob | commitdiff | raw | diff to current
2011-08-15  Junio C HamanoMerge branch 'rt/zlib-smaller-window' into next blob | commitdiff | raw | diff to current
2011-08-15  Junio C HamanoMerge branch 'jn/maint-test-return' into next blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Don't re-sort a list whose order we... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Fix virtual merge base for rename... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Avoid unnecessary file rewrites blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Fix spurious 'refusing to lose untrack... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Fix working copy handling for rename... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: add handling for rename/rename/add... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Have conflict_rename_delete reuse... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Make modify/delete handling code reusable blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Consider modifications in rename/renam... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Create function for merging with branc... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Record more data needed for merging... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Defer rename/rename(2to1) handling... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Small cleanups for conflict_rename_ren... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Fix rename/rename(1to2) resolution... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Introduce a merge_file convenience... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Fix modify/delete resolution in the... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: When we detect we can skip an update... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Provide more info in conflict markers... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Cleanup and consolidation of rename_co... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Consolidate process_entry() and proces... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Improve handling of rename target... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Add comments about handling rename... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Make dead code for rename/rename(2to1... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Fix deletion of untracked file in... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Split update_stages_and_entry; only... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Allow make_room_for_path() to remove... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Split was_tracked() out of would_lose_... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Save D/F conflict filenames instead... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Fix code checking for D/F conflicts... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Fix sorting order and directory change... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Fix recursive case with D/F conflict... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Avoid working directory changes during... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Remember to free generated unique... blob | commitdiff | raw | diff to current
2011-08-14  Elijah Newrenmerge-recursive: Consolidate different update_stages... blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.