tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Improve the mingw getaddrinfo stub to handle more use cases
[git.git]
/
merge-recursive.c
2010-08-22
Junio C Hamano
Merge branch 'so/http-user-agent'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'mm/shortopt-detached'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'sr/local-config'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'nd/fix-sparse-checkout'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'hv/submodule-find-ff-merge'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'en/rebase-against-rebase-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'dg/local-mod-error-messages'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'po/userdiff-csharp'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'ab/perl-install'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-20
Elijah Newren
merge-recursive: Avoid excessive output for and reproce...
blob
|
commitdiff
|
raw
|
diff to current
2010-08-19
Junio C Hamano
Merge branch 'maint' to sync with 1.7.2.2
blob
|
commitdiff
|
raw
|
diff to current
2010-08-19
Junio C Hamano
Merge branch 'tr/xsize-bits' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-19
Junio C Hamano
Merge branch 'jc/sha1-name-find-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'sp/fix-smart-http-deadlock-on-error'...
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'jc/maint-follow-rename-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'tf/string-list-init'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'cc/find-commit-subject'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'ab/report-corrupt-object-with-type'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'jn/fast-import-subtree'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'ar/string-list-foreach'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'jh/graph-next-line'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'tr/xsize-bits'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Elijah Newren
merge-recursive: Fix multiple file rename across D...
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Elijah Newren
merge-recursive: Fix typo
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'tc/checkout-B'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-13
Junio C Hamano
Merge branch 'jc/sha1-name-find-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-13
Junio C Hamano
Merge branch 'sp/fix-smart-http-deadlock-on-error'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-11
Matthieu Moy
unpack_trees: group error messages by type
blob
|
commitdiff
|
raw
|
diff to current
2010-08-11
Matthieu Moy
merge-recursive: distinguish "removed" and "overwritten...
blob
|
commitdiff
|
raw
|
diff to current
2010-08-11
Diane Gasselin
merge-recursive: porcelain messages for checkout
blob
|
commitdiff
|
raw
|
diff to current
2010-08-11
Matthieu Moy
Turn unpack_trees_options.msgs into an array + enum
blob
|
commitdiff
|
raw
|
diff to current
2010-08-06
Jonathan Nieder
merge-recursive --renormalize
blob
|
commitdiff
|
raw
|
diff to current
2010-08-06
Jonathan Nieder
ll-merge: let caller decide whether to renormalize
blob
|
commitdiff
|
raw
|
diff to current
2010-08-06
Jonathan Nieder
ll-merge: make flag easier to populate
blob
|
commitdiff
|
raw
|
diff to current
2010-08-06
Jonathan Nieder
merge-trees: let caller decide whether to renormalize
blob
|
commitdiff
|
raw
|
diff to current
2010-08-06
Jonathan Nieder
merge-trees: push choice to renormalize away from low...
blob
|
commitdiff
|
raw
|
diff to current
2010-08-03
Junio C Hamano
Merge branch 'gp/pack-refs-remove-empty-dirs'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-03
Junio C Hamano
Merge branch 'sv/maint-diff-q-clear-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-02
Junio C Hamano
Merge branch 'ab/tap' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-02
Junio C Hamano
Merge git://repo.or.cz/git-gui into pt/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2010-07-27
Junio C Hamano
Sync with 1.7.1.2
blob
|
commitdiff
|
raw
|
diff to current
2010-07-27
Junio C Hamano
Sync with 1.7.0 series
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.7.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.6.6' into maint-1.7.0
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.6.5' into maint-1.6.6
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.6.4' into maint-1.6.5
blob
|
commitdiff
|
raw
|
diff to current
2010-07-23
Christian Couder
merge-recursive: use find_commit_subject() instead...
blob
|
commitdiff
|
raw
|
diff to current
2010-07-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-19
Junio C Hamano
Merge branch 'jl/add-n-ignore-missing'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-16
Junio C Hamano
Merge branch 'jc/diff-merge-base-multi'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-15
Junio C Hamano
Merge branch 'jn/paginate-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-15
Junio C Hamano
Merge branch 'wp/merge-tree-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-15
Junio C Hamano
Merge branch 'js/merge-rr-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-15
Junio C Hamano
Merge branch 'jc/diff-merge-base-multi'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-15
Junio C Hamano
Merge branch 'ns/merge-recursive-uptodate'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-15
Junio C Hamano
Merge branch 'jk/maint-status-keep-index-timestamp'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-15
Junio C Hamano
Merge branch 'bc/maint-makefile-fixes'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-09
Nicolas Sebrecht
merge-recursive: use "up-to-date" instead of "uptodate...
blob
|
commitdiff
|
raw
|
diff to current
2010-07-09
Elijah Newren
merge_recursive: Fix renames across paths below D/F...
blob
|
commitdiff
|
raw
|
diff to current
2010-07-09
Elijah Newren
merge-recursive: Fix D/F conflicts
blob
|
commitdiff
|
raw
|
diff to current
2010-07-09
Junio C Hamano
Merge remote branch 'ko/master' into jc/read-tree-cache...
blob
|
commitdiff
|
raw
|
diff to current
2010-07-07
Junio C Hamano
Merge branch 'ab/tap'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-07
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-07-07
Junio C Hamano
Merge branch 'tr/receive-pack-aliased-update-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-07-07
Heiko Voigt
Implement automatic fast-forward merge for submodules
blob
|
commitdiff
|
raw
|
diff to current
2010-07-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-05
Thiago Farina
string_list: Add STRING_LIST_INIT macro and make use...
blob
|
commitdiff
|
raw
|
diff to current
2010-07-02
Eyvind Bernhardsen
Try normalizing files to avoid delete/modify conflicts...
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'ar/decorate-color'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'mg/doc-rev-parse-treepath-syntax'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'cc/cherry-pick-stdin'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'jl/status-ignore-submodules'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'jk/url-decode'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'jp/string-list-api-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'as/maint-completion-set-u-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-30
Junio C Hamano
Merge branch 'jl/maint-diff-ignore-submodules'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-28
Junio C Hamano
Merge branch 'tr/send-email-8bit' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-28
Junio C Hamano
Merge branch 'pb/maint-perl-errmsg-no-dir' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-28
Junio C Hamano
Merge branch 'js/maint-am-rebase-invalid-author' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-06-28
Junio C Hamano
Merge branch 'jc/maint-simpler-common-prefix' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-06-28
Junio C Hamano
Merge branch 'bd/maint-unpack-trees-parawalk-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-06-27
Junio C Hamano
Merge branch 'pb/maint-perl-errmsg-no-dir'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-27
Junio C Hamano
Merge branch 'tr/send-email-8bit'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-27
Junio C Hamano
Merge branch 'js/maint-am-rebase-invalid-author'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-27
Julian Phillips
Merge branch 'jp/string-list-api-cleanup' into jn/grep...
blob
|
commitdiff
|
raw
|
diff to current
2010-06-27
Julian Phillips
string_list: Fix argument order for string_list_lookup
blob
|
commitdiff
|
raw
|
diff to current
2010-06-27
Julian Phillips
string_list: Fix argument order for string_list_insert
blob
|
commitdiff
|
raw
|
diff to current
2010-06-22
Junio C Hamano
Merge branch 'jc/maint-simpler-common-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-22
Junio C Hamano
Merge branch 'bd/maint-unpack-trees-parawalk-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-22
Junio C Hamano
Merge branch 'jc/rev-list-ancestry-path'
blob
|
commitdiff
|
raw
|
diff to current
next