tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge branch 'maint-1.7.6' into maint-1.7.7
[git.git]
/
merge-recursive.c
2011-08-29
Junio C Hamano
Merge branch 'di/fast-import-blob-tweak'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'di/fast-import-deltified-tree'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'di/fast-import-ident'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'bw/doc-repo-layout'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'va/p4-branch-import'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'jc/combine-diff-callback'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'nk/branch-v-abbrev'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'jc/merge-reword'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'mg/branch-set-upstream-previous'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'da/difftool-mergtool-refactor'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'jc/maint-autofix-tag-in-head'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'di/fast-import-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'jn/plug-empty-tree-leak'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'ac/describe-dirty-refresh'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'di/parse-options-split'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'js/i18n-scripts'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-24
Junio C Hamano
Sync with 1.7.6.1
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'rt/zlib-smaller-window'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'jn/maint-test-return'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'cb/maint-ls-files-error-report'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'jc/maint-combined-diff-work-tree' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-19
Junio C Hamano
Merge branch 'db/am-skip-blank-at-the-beginning'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-19
Junio C Hamano
Merge branch 'ma/am-exclude'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-18
Junio C Hamano
Merge branch 'mh/check-attr-relative'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-18
Junio C Hamano
Merge branch 'js/bisect-no-checkout'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-18
Junio C Hamano
Merge branch 'rc/histogram-diff'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-18
Junio C Hamano
Merge branch 'jc/maint-combined-diff-work-tree'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-18
Junio C Hamano
Merge branch 'rc/histogram-diff' into HEAD
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Jonathan Nieder
merge-recursive: take advantage of hardcoded empty...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jk/tag-list-multiple-patterns' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jl/submodule-add-relurl-wo-upstream'...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jk/fast-export-quote-path' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'bw/log-all-ref-updates-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'js/maint-add-path-stat-pwd' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jn/mime-type-with-params' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jc/submodule-sync-no-auto-vivify' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jc/zlib-wrap' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jc/diff-index-quick-exit-early' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Don't re-sort a list whose order we...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Fix virtual merge base for rename...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Avoid unnecessary file rewrites
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Fix spurious 'refusing to lose untrack...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Fix working copy handling for rename...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: add handling for rename/rename/add...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Have conflict_rename_delete reuse...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Make modify/delete handling code reusable
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Consider modifications in rename/renam...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Create function for merging with branc...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Record more data needed for merging...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Defer rename/rename(2to1) handling...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Small cleanups for conflict_rename_ren...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Fix rename/rename(1to2) resolution...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Introduce a merge_file convenience...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Fix modify/delete resolution in the...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: When we detect we can skip an update...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Provide more info in conflict markers...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Cleanup and consolidation of rename_co...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Consolidate process_entry() and proces...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Improve handling of rename target...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Add comments about handling rename...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Make dead code for rename/rename(2to1...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Fix deletion of untracked file in...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Split update_stages_and_entry; only...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Allow make_room_for_path() to remove...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Split was_tracked() out of would_lose_...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Save D/F conflict filenames instead...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Fix code checking for D/F conflicts...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Fix sorting order and directory change...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Fix recursive case with D/F conflict...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Avoid working directory changes during...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Remember to free generated unique...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Consolidate different update_stages...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Mark some diff_filespec struct argumen...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Correct a comment
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Make BUG message more legible by addin...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-11
Junio C Hamano
Merge branch 'jk/fast-export-quote-path'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-11
Junio C Hamano
Merge branch 'rc/maint-http-wrong-free'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-01
Junio C Hamano
Merge branch 'jk/clone-detached'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-01
Junio C Hamano
Merge branch 'jc/streaming-filter'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-01
Junio C Hamano
Merge branch 'nk/ref-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-01
Junio C Hamano
Merge branch 'jl/maint-fetch-recursive-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-01
Junio C Hamano
Merge branch 'jc/maint-cygwin-trust-executable-bit...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-01
Junio C Hamano
Merge branch 'jc/legacy-loose-object' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-01
Junio C Hamano
Merge branch 'an/shallow-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-01
Junio C Hamano
Merge branch 'jc/maint-1.7.3-checkout-describe' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-07-22
Junio C Hamano
Merge branch 'dc/stash-con-untracked'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-22
Junio C Hamano
Merge branch 'jk/tag-contains-ab'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-22
Junio C Hamano
Merge branch 'bw/log-all-ref-updates-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-22
Junio C Hamano
Merge branch 'js/maint-add-path-stat-pwd'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-22
Junio C Hamano
Merge branch 'jn/gitweb-search'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-22
Junio C Hamano
Merge branch 'jl/submodule-add-relurl-wo-upstream'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-19
Junio C Hamano
Merge branch 'jc/index-pack'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-19
Junio C Hamano
Merge branch 'jn/mime-type-with-params'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-19
Junio C Hamano
Merge branch 'jc/submodule-sync-no-auto-vivify'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-19
Junio C Hamano
Merge branch 'jk/clone-cmdline-config'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
