Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
msvc: opendir: do not start the search
[gitweb.git]
/
merge-recursive.c
2010-09-01
Merge branch 'gp/pack-refs-remove-empty-dirs' into...
blob
|
diff
|
raw
2010-09-01
Merge branch 'sg/rerere-gc-old-still-used' into maint
blob
|
diff
|
raw
2010-09-01
Merge branch 'en/rebase-against-rebase-fix' into maint
blob
|
diff
|
raw
2010-08-31
Merge branch 'np/maint-huge-delta-generation'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'da/fix-submodule-sync-superproject-config'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'jn/cherry-revert-message-clean-up'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'cb/binary-patch-id'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'dj/fetch-tagopt'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'en/d-f-conflict-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'jn/svn-fe'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'tr/maint-no-unquote-plus'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'jn/paginate-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'jn/maint-setup-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'en/fast-export-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'hv/autosquash-config'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'sg/rerere-gc-old-still-used'
blob
|
diff
|
raw
|
diff to current
2010-08-30
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-08-30
Merge branch 'maint-1.7.1' into maint
blob
|
diff
|
raw
2010-08-27
merge-recursive: options to ignore whitespace changes
blob
|
diff
|
raw
|
diff to current
2010-08-26
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-08-26
merge-recursive --patience
blob
|
diff
|
raw
|
diff to current
2010-08-26
ll-merge: replace flag argument with options struct
blob
|
diff
|
raw
|
diff to current
2010-08-26
merge-recursive: expose merge options for builtin merge
blob
|
diff
|
raw
|
diff to current
2010-08-24
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-08-23
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'mm/rebase-i-exec'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'gb/split-cmdline-errmsg'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'so/http-user-agent'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'mm/shortopt-detached'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'sr/local-config'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'nd/fix-sparse-checkout'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'hv/submodule-find-ff-merge'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'en/rebase-against-rebase-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'dg/local-mod-error-messages'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'po/userdiff-csharp'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'ab/perl-install'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-08-20
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-08-20
merge-recursive: Avoid excessive output for and reproce...
blob
|
diff
|
raw
|
diff to current
2010-08-19
Merge branch 'maint' to sync with 1.7.2.2
blob
|
diff
|
raw
|
diff to current
2010-08-19
Merge branch 'tr/xsize-bits' into maint
blob
|
diff
|
raw
2010-08-19
Merge branch 'jc/sha1-name-find-fix' into maint
blob
|
diff
|
raw
2010-08-18
Merge branch 'sp/fix-smart-http-deadlock-on-error'...
blob
|
diff
|
raw
2010-08-18
Merge branch 'jc/maint-follow-rename-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-18
Merge branch 'tf/string-list-init'
blob
|
diff
|
raw
|
diff to current
2010-08-18
Merge branch 'cc/find-commit-subject'
blob
|
diff
|
raw
|
diff to current
2010-08-18
Merge branch 'ab/report-corrupt-object-with-type'
blob
|
diff
|
raw
2010-08-18
Merge branch 'jn/fast-import-subtree'
blob
|
diff
|
raw
2010-08-18
Merge branch 'ar/string-list-foreach'
blob
|
diff
|
raw
2010-08-18
Merge branch 'jh/graph-next-line'
blob
|
diff
|
raw
2010-08-18
Merge branch 'tr/xsize-bits'
blob
|
diff
|
raw
2010-08-18
merge-recursive: Fix multiple file rename across D...
blob
|
diff
|
raw
|
diff to current
2010-08-18
merge-recursive: Fix typo
blob
|
diff
|
raw
|
diff to current
2010-08-18
Merge branch 'tc/checkout-B'
blob
|
diff
|
raw
2010-08-13
Merge branch 'jc/sha1-name-find-fix'
blob
|
diff
|
raw
2010-08-13
Merge branch 'sp/fix-smart-http-deadlock-on-error'
blob
|
diff
|
raw
2010-08-11
unpack_trees: group error messages by type
blob
|
diff
|
raw
|
diff to current
2010-08-11
merge-recursive: distinguish "removed" and "overwritten...
blob
|
diff
|
raw
|
diff to current
2010-08-11
merge-recursive: porcelain messages for checkout
blob
|
diff
|
raw
|
diff to current
2010-08-11
Turn unpack_trees_options.msgs into an array + enum
blob
|
diff
|
raw
|
diff to current
2010-08-06
merge-recursive --renormalize
blob
|
diff
|
raw
|
diff to current
2010-08-06
ll-merge: let caller decide whether to renormalize
blob
|
diff
|
raw
|
diff to current
2010-08-06
ll-merge: make flag easier to populate
blob
|
diff
|
raw
|
diff to current
2010-08-06
merge-trees: let caller decide whether to renormalize
blob
|
diff
|
raw
|
diff to current
2010-08-06
merge-trees: push choice to renormalize away from low...
blob
|
diff
|
raw
|
diff to current
2010-08-03
Merge branch 'gp/pack-refs-remove-empty-dirs'
blob
|
diff
|
raw
2010-08-03
Merge branch 'sv/maint-diff-q-clear-fix' into maint
blob
|
diff
|
raw
2010-08-02
Merge branch 'ab/tap' into maint
blob
|
diff
|
raw
2010-08-02
Merge git://repo.or.cz/git-gui into pt/git-gui
blob
|
diff
|
raw
2010-07-27
Sync with 1.7.1.2
blob
|
diff
|
raw
2010-07-27
Sync with 1.7.0 series
blob
|
diff
|
raw
|
diff to current
2010-07-26
Merge branch 'maint-1.7.1' into maint
blob
|
diff
|
raw
2010-07-26
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
diff
|
raw
|
diff to current
2010-07-26
Merge branch 'maint-1.6.6' into maint-1.7.0
blob
|
diff
|
raw
|
diff to current
2010-07-26
Merge branch 'maint-1.6.5' into maint-1.6.6
blob
|
diff
|
raw
|
diff to current
2010-07-26
Merge branch 'maint-1.6.4' into maint-1.6.5
blob
|
diff
|
raw
|
diff to current
2010-07-23
merge-recursive: use find_commit_subject() instead...
blob
|
diff
|
raw
|
diff to current
2010-07-20
Merge branch 'maint'
blob
|
diff
|
raw
2010-07-19
Merge branch 'maint'
blob
|
diff
|
raw
2010-07-19
Merge branch 'jl/add-n-ignore-missing'
blob
|
diff
|
raw
2010-07-16
Merge branch 'jc/diff-merge-base-multi'
blob
|
diff
|
raw
2010-07-15
Merge branch 'jn/paginate-fix'
blob
|
diff
|
raw
2010-07-15
Merge branch 'wp/merge-tree-fix'
blob
|
diff
|
raw
2010-07-15
Merge branch 'js/merge-rr-fix'
blob
|
diff
|
raw
2010-07-15
Merge branch 'jc/diff-merge-base-multi'
blob
|
diff
|
raw
2010-07-15
Merge branch 'ns/merge-recursive-uptodate'
blob
|
diff
|
raw
2010-07-15
Merge branch 'jk/maint-status-keep-index-timestamp'
blob
|
diff
|
raw
|
diff to current
2010-07-15
Merge branch 'bc/maint-makefile-fixes'
blob
|
diff
|
raw
|
diff to current
2010-07-15
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-07-13
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-07-12
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-07-09
merge-recursive: use "up-to-date" instead of "uptodate...
blob
|
diff
|
raw
2010-07-09
merge_recursive: Fix renames across paths below D/F...
blob
|
diff
|
raw
|
diff to current
2010-07-09
merge-recursive: Fix D/F conflicts
blob
|
diff
|
raw
|
diff to current
2010-07-09
Merge remote branch 'ko/master' into jc/read-tree-cache...
blob
|
diff
|
raw
|
diff to current
2010-07-07
Merge branch 'ab/tap'
blob
|
diff
|
raw
|
diff to current
2010-07-07
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-07-07
Merge branch 'maint-1.6.4' into maint
blob
|
diff
|
raw
|
diff to current
2010-07-07
Merge branch 'tr/receive-pack-aliased-update-fix' into...
blob
|
diff
|
raw
|
diff to current
next