Merge branch 'tr/maint-strbuf-grow-nul-termination'
[git] / merge-recursive.c
2011-09-02  Junio C HamanoMerge branch 'tr/maint-strbuf-grow-nul-termination'
2011-09-02  Junio C HamanoMerge branch 'tr/maint-ident-to-git-memmove'
2011-09-02  Junio C HamanoMerge branch 'tr/maint-format-patch-empty-output'
2011-09-02  Junio C HamanoMerge branch 'gb/maint-am-stgit-author-to-from-fix'
2011-09-02  Junio C HamanoMerge branch 'gb/maint-am-patch-format-error-message'
2011-09-02  Junio C HamanoMerge branch 'ms/daemon-timeout-is-in-seconds'
2011-09-02  Junio C HamanoMerge branch 'bg/t5540-osx-grep'
2011-09-02  Junio C HamanoMerge branch 'jc/clean-exclude-doc'
2011-09-02  Junio C HamanoMerge branch 'mg/maint-notes-C-doc'
2011-09-02  Junio C HamanoMerge branch 'fg/submodule-ff-check-before-push'
2011-09-02  Junio C HamanoMerge branch 'rc/diff-cleanup-records'
2011-09-02  Junio C HamanoMerge branch 'fk/use-kwset-pickaxe-grep-f'
2011-09-02  Junio C HamanoMerge branch 'en/merge-recursive-2'
2011-08-30  Junio C HamanoMerge branch 'maint'
2011-08-29  Junio C HamanoMerge branch 'nd/decorate-grafts'
2011-08-29  Junio C HamanoMerge branch 'nd/maint-clone-gitdir'
2011-08-29  Junio C HamanoMerge branch 'ci/forbid-unwanted-current-branch-update'
2011-08-29  Junio C HamanoMerge branch 'jk/pager-with-external-command'
2011-08-29  Junio C HamanoMerge branch 'jc/maint-clone-alternates'
2011-08-29  Junio C HamanoMerge branch 'jk/color-and-pager'
2011-08-29  Junio C HamanoMerge branch 'mh/attr'
2011-08-29  Junio C HamanoMerge branch 'di/fast-import-tagging'
2011-08-29  Junio C HamanoMerge branch 'di/fast-import-blob-tweak'
2011-08-29  Junio C HamanoMerge branch 'di/fast-import-deltified-tree'
2011-08-29  Junio C HamanoMerge branch 'di/fast-import-ident'
2011-08-29  Junio C HamanoMerge branch 'bw/doc-repo-layout'
2011-08-29  Junio C HamanoMerge branch 'va/p4-branch-import'
2011-08-29  Junio C HamanoMerge branch 'jc/combine-diff-callback'
2011-08-29  Junio C HamanoMerge branch 'nk/branch-v-abbrev'
2011-08-25  Junio C HamanoMerge branch 'jc/merge-reword'
2011-08-25  Junio C HamanoMerge branch 'mg/branch-set-upstream-previous'
2011-08-25  Junio C HamanoMerge branch 'da/difftool-mergtool-refactor'
2011-08-25  Junio C HamanoMerge branch 'jc/maint-autofix-tag-in-head'
2011-08-25  Junio C HamanoMerge branch 'di/fast-import-doc'
2011-08-25  Junio C HamanoMerge branch 'jn/plug-empty-tree-leak'
2011-08-25  Junio C HamanoMerge branch 'ac/describe-dirty-refresh'
2011-08-25  Junio C HamanoMerge branch 'di/parse-options-split'
2011-08-25  Junio C HamanoMerge branch 'js/i18n-scripts'
2011-08-25  Junio C HamanoMerge branch 'maint'
2011-08-24  Junio C HamanoSync with 1.7.6.1
2011-08-23  Junio C HamanoMerge branch 'rt/zlib-smaller-window'
2011-08-23  Junio C HamanoMerge branch 'jn/maint-test-return'
2011-08-23  Junio C HamanoMerge branch 'cb/maint-ls-files-error-report'
2011-08-23  Junio C HamanoMerge branch 'maint'
2011-08-23  Junio C HamanoMerge branch 'jc/maint-combined-diff-work-tree' into...
2011-08-23  Junio C HamanoMerge branch 'maint'
2011-08-19  Junio C HamanoMerge branch 'db/am-skip-blank-at-the-beginning'
2011-08-19  Junio C HamanoMerge branch 'ma/am-exclude'
2011-08-19  Junio C HamanoMerge branch 'maint'
2011-08-18  Junio C HamanoMerge branch 'mh/check-attr-relative'
2011-08-18  Junio C HamanoMerge branch 'js/bisect-no-checkout'
2011-08-18  Junio C HamanoMerge branch 'rc/histogram-diff'
2011-08-18  Junio C HamanoMerge branch 'jc/maint-combined-diff-work-tree'
2011-08-18  Junio C HamanoMerge branch 'rc/histogram-diff' into HEAD
2011-08-16  Jonathan Niedermerge-recursive: take advantage of hardcoded empty...
2011-08-16  Junio C HamanoMerge branch 'jk/tag-list-multiple-patterns' into maint
2011-08-16  Junio C HamanoMerge branch 'jl/submodule-add-relurl-wo-upstream'...
2011-08-16  Junio C HamanoMerge branch 'jk/fast-export-quote-path' into maint
2011-08-16  Junio C HamanoMerge branch 'bw/log-all-ref-updates-doc' into maint
2011-08-16  Junio C HamanoMerge branch 'js/maint-add-path-stat-pwd' into maint
2011-08-16  Junio C HamanoMerge branch 'jn/mime-type-with-params' into maint
2011-08-16  Junio C HamanoMerge branch 'jc/submodule-sync-no-auto-vivify' into...
2011-08-16  Junio C HamanoMerge branch 'jc/zlib-wrap' into maint
2011-08-16  Junio C HamanoMerge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
2011-08-16  Junio C HamanoMerge branch 'jc/diff-index-quick-exit-early' into...
2011-08-14  Elijah Newrenmerge-recursive: Don't re-sort a list whose order we...
2011-08-14  Elijah Newrenmerge-recursive: Fix virtual merge base for rename...
2011-08-14  Elijah Newrenmerge-recursive: Avoid unnecessary file rewrites
2011-08-14  Elijah Newrenmerge-recursive: Fix spurious 'refusing to lose untrack...
2011-08-14  Elijah Newrenmerge-recursive: Fix working copy handling for rename...
2011-08-14  Elijah Newrenmerge-recursive: add handling for rename/rename/add...
2011-08-14  Elijah Newrenmerge-recursive: Have conflict_rename_delete reuse...
2011-08-14  Elijah Newrenmerge-recursive: Make modify/delete handling code reusable
2011-08-14  Elijah Newrenmerge-recursive: Consider modifications in rename/renam...
2011-08-14  Elijah Newrenmerge-recursive: Create function for merging with branc...
2011-08-14  Elijah Newrenmerge-recursive: Record more data needed for merging...
2011-08-14  Elijah Newrenmerge-recursive: Defer rename/rename(2to1) handling...
2011-08-14  Elijah Newrenmerge-recursive: Small cleanups for conflict_rename_ren...
2011-08-14  Elijah Newrenmerge-recursive: Fix rename/rename(1to2) resolution...
2011-08-14  Elijah Newrenmerge-recursive: Introduce a merge_file convenience...
2011-08-14  Elijah Newrenmerge-recursive: Fix modify/delete resolution in the...
2011-08-14  Elijah Newrenmerge-recursive: When we detect we can skip an update...
2011-08-14  Elijah Newrenmerge-recursive: Provide more info in conflict markers...
2011-08-14  Elijah Newrenmerge-recursive: Cleanup and consolidation of rename_co...
2011-08-14  Elijah Newrenmerge-recursive: Consolidate process_entry() and proces...
2011-08-14  Elijah Newrenmerge-recursive: Improve handling of rename target...
2011-08-14  Elijah Newrenmerge-recursive: Add comments about handling rename...
2011-08-14  Elijah Newrenmerge-recursive: Make dead code for rename/rename(2to1...
2011-08-14  Elijah Newrenmerge-recursive: Fix deletion of untracked file in...
2011-08-14  Elijah Newrenmerge-recursive: Split update_stages_and_entry; only...
2011-08-14  Elijah Newrenmerge-recursive: Allow make_room_for_path() to remove...
2011-08-14  Elijah Newrenmerge-recursive: Split was_tracked() out of would_lose_...
2011-08-14  Elijah Newrenmerge-recursive: Save D/F conflict filenames instead...
2011-08-14  Elijah Newrenmerge-recursive: Fix code checking for D/F conflicts...
2011-08-14  Elijah Newrenmerge-recursive: Fix sorting order and directory change...
2011-08-14  Elijah Newrenmerge-recursive: Fix recursive case with D/F conflict...
2011-08-14  Elijah Newrenmerge-recursive: Avoid working directory changes during...
2011-08-14  Elijah Newrenmerge-recursive: Remember to free generated unique...
2011-08-14  Elijah Newrenmerge-recursive: Consolidate different update_stages...
2011-08-14  Elijah Newrenmerge-recursive: Mark some diff_filespec struct argumen...
next