tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
gitweb: Fix unintended "--no-merges" for regular Atom feed
[git.git]
/
merge-recursive.c
2012-04-10
Junio C Hamano
Merge branch 'maint-1.7.9' into maint
blob
|
commitdiff
|
raw
2012-04-10
Junio C Hamano
Merge branch 'maint-1.7.8' into maint-1.7.9
blob
|
commitdiff
|
raw
|
diff to current
2012-04-10
David A. Greene
Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
blob
|
commitdiff
|
raw
2012-04-09
Junio C Hamano
Merge branch 'jc/maint-verify-objects-remove-pessimism...
blob
|
commitdiff
|
raw
|
diff to current
2012-04-09
Junio C Hamano
Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8
blob
|
commitdiff
|
raw
|
diff to current
2012-04-09
Junio C Hamano
Merge branch 'tr/cache-tree' into maint-1.7.8
blob
|
commitdiff
|
raw
|
diff to current
2012-04-09
Junio C Hamano
Merge branch 'cb/maint-t5541-make-server-port-portable...
blob
|
commitdiff
|
raw
|
diff to current
2012-04-02
Junio C Hamano
Merge branch 'pt/gitk'
blob
|
commitdiff
|
raw
2012-04-02
Junio C Hamano
Sync with 1.7.9.6
blob
|
commitdiff
|
raw
2012-03-31
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2012-03-26
Junio C Hamano
Sync with 1.7.9.5
blob
|
commitdiff
|
raw
2012-03-26
Junio C Hamano
Merge branch 'jn/maint-fast-import-empty-ls' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-26
Junio C Hamano
Merge branch 'ph/rerere-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-26
Junio C Hamano
Merge branch 'ms/maint-config-error-at-eol-linecount...
blob
|
commitdiff
|
raw
|
diff to current
2012-03-24
Junio C Hamano
Merge gitk changes from Paul Mackerras at git://ozlabs...
blob
|
commitdiff
|
raw
2012-03-23
Junio C Hamano
Merge branch 'am/completion-zsh-fix'
blob
|
commitdiff
|
raw
2012-03-23
Junio C Hamano
Merge branch 'dw/gitweb-doc-grammo'
blob
|
commitdiff
|
raw
2012-03-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2012-03-20
Junio C Hamano
Merge branch 'maint-1.7.8' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-16
Junio C Hamano
Merge branch 'ab/perl-i18n'
blob
|
commitdiff
|
raw
2012-03-16
Junio C Hamano
Merge branch 'jc/maint-verify-objects-remove-pessimism'
blob
|
commitdiff
|
raw
2012-03-16
Junio C Hamano
Merge "two fixes for fast-import's 'ls' command" from...
blob
|
commitdiff
|
raw
2012-03-16
Junio C Hamano
Merge branch 'th/doc-diff-submodule-option'
blob
|
commitdiff
|
raw
2012-03-13
Junio C Hamano
Merge branch 'jc/maint-undefined-i18n-observation-test'
blob
|
commitdiff
|
raw
2012-03-13
Junio C Hamano
Merge branch 'ms/maint-config-error-at-eol-linecount'
blob
|
commitdiff
|
raw
2012-03-13
Junio C Hamano
Merge branch 'ph/rerere-doc'
blob
|
commitdiff
|
raw
2012-03-12
Junio C Hamano
Merge branch 'az/verify-tag-use-gpg-config'
blob
|
commitdiff
|
raw
2012-03-12
Junio C Hamano
Sync with 1.7.9.4
blob
|
commitdiff
|
raw
2012-03-12
Junio C Hamano
Merge branch 'tr/maint-bundle-boundary' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-12
Junio C Hamano
Merge branch 'jc/maint-diff-patch-header' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-12
Junio C Hamano
Merge branch 'jn/maint-do-not-match-with-unsanitized...
blob
|
commitdiff
|
raw
|
diff to current
2012-03-12
Junio C Hamano
Merge branch 'jc/am-3-nonstandard-popt' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-08
Junio C Hamano
Merge branch 'kb/maint-prune-rmdir-closedir'
blob
|
commitdiff
|
raw
2012-03-08
Junio C Hamano
Merge branch 'jl/maint-submodule-relative'
blob
|
commitdiff
|
raw
2012-03-08
Junio C Hamano
Merge branch 'jn/maint-do-not-match-with-unsanitized...
blob
|
commitdiff
|
raw
2012-03-08
Junio C Hamano
Merge branch 'vr/branch-doc'
blob
|
commitdiff
|
raw
2012-03-07
Junio C Hamano
Merge branch 'jc/pickaxe-ignore-case'
blob
|
commitdiff
|
raw
2012-03-06
Junio C Hamano
Merge branch 'jh/threadable-symlink-check'
blob
|
commitdiff
|
raw
2012-03-06
Junio C Hamano
Merge branch 'jc/maint-diff-patch-header'
blob
|
commitdiff
|
raw
2012-03-06
Junio C Hamano
Merge branch 'sl/modern-t0000'
blob
|
commitdiff
|
raw
2012-03-06
Junio C Hamano
Merge branch 'tr/maint-bundle-boundary'
blob
|
commitdiff
|
raw
2012-03-06
Junio C Hamano
Merge branch 'zj/diff-stat-dyncol'
blob
|
commitdiff
|
raw
2012-03-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2012-03-06
Junio C Hamano
Merge branch 'maint-1.7.8' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-06
Junio C Hamano
Merge branch 'maint-1.7.7' into maint-1.7.8
blob
|
commitdiff
|
raw
|
diff to current
2012-03-05
Junio C Hamano
Sync with 1.7.9.3
blob
|
commitdiff
|
raw
2012-03-05
Junio C Hamano
Merge branch 'jc/doc-merge-options' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-05
Junio C Hamano
Merge branch 'cn/maint-rev-list-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-05
Junio C Hamano
Merge branch 'jc/am-3-nonstandard-popt'
blob
|
commitdiff
|
raw
2012-03-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2012-03-05
Junio C Hamano
Merge branch 'cn/maint-branch-with-bad' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-05
Junio C Hamano
Merge branch 'jn/maint-gitweb-invalid-regexp' into...
blob
|
commitdiff
|
raw
|
diff to current
2012-03-05
Junio C Hamano
Merge branch 'nd/maint-verify-objects' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-05
Junio C Hamano
Merge branch 'jk/maint-avoid-streaming-filtered-content...
blob
|
commitdiff
|
raw
|
diff to current
2012-03-05
Junio C Hamano
Merge branch 'jb/filter-ignore-sigpipe' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-05
Junio C Hamano
Merge branch 'sp/smart-http-failure-to-push' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-05
Junio C Hamano
Merge branch 'tr/maint-bundle-long-subject' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-03-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2012-03-02
Junio C Hamano
Merge branch 'rs/no-no-no-parseopt'
blob
|
commitdiff
|
raw
2012-03-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2012-03-01
Junio C Hamano
Merge branch 'nd/maint-verify-objects'
blob
|
commitdiff
|
raw
2012-03-01
Junio C Hamano
Merge branch 'jn/maint-gitweb-invalid-regexp'
blob
|
commitdiff
|
raw
2012-03-01
Junio C Hamano
Merge branch 'cn/maint-rev-list-doc'
blob
|
commitdiff
|
raw
2012-03-01
Junio C Hamano
Merge branch 'cn/maint-branch-with-bad'
blob
|
commitdiff
|
raw
2012-02-28
Junio C Hamano
Merge branch 'pj/completion-remote-set-url-branches'
blob
|
commitdiff
|
raw
2012-02-28
Junio C Hamano
Merge branch 'ph/cherry-pick-advice-refinement'
blob
|
commitdiff
|
raw
2012-02-28
Jiang Xin
Merge branch 'master' into git-po
blob
|
commitdiff
|
raw
2012-02-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2012-02-27
Junio C Hamano
Merge branch 'pj/remote-set-branches-usage-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-27
Junio C Hamano
Merge branch 'jn/ancient-meld-support' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-27
Junio C Hamano
Merge branch 'tr/maint-bundle-long-subject'
blob
|
commitdiff
|
raw
2012-02-27
Junio C Hamano
Merge branch 'sp/smart-http-failure-to-push'
blob
|
commitdiff
|
raw
2012-02-27
Junio C Hamano
Merge branch 'jc/doc-merge-options'
blob
|
commitdiff
|
raw
2012-02-27
Junio C Hamano
Merge branch 'jk/maint-avoid-streaming-filtered-contents'
blob
|
commitdiff
|
raw
2012-02-27
Junio C Hamano
Merge branch 'jb/filter-ignore-sigpipe'
blob
|
commitdiff
|
raw
2012-02-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2012-02-27
Junio C Hamano
Sync with 1.7.8.5
blob
|
commitdiff
|
raw
|
diff to current
2012-02-25
Junio C Hamano
Merge branches zj/decimal-width, zj/term-columns and...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-23
Junio C Hamano
Merge branch 'ld/git-p4-expanded-keywords'
blob
|
commitdiff
|
raw
2012-02-23
Junio C Hamano
Merge branch 'jk/config-include'
blob
|
commitdiff
|
raw
2012-02-23
Junio C Hamano
Merge branch 'jc/add-refresh-unmerged'
blob
|
commitdiff
|
raw
2012-02-23
Junio C Hamano
Merge branch 'js/configure-libintl'
blob
|
commitdiff
|
raw
2012-02-23
Junio C Hamano
Merge branch 'pj/remote-set-branches-usage-fix'
blob
|
commitdiff
|
raw
2012-02-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2012-02-23
Junio C Hamano
Sync with 1.7.9.2
blob
|
commitdiff
|
raw
2012-02-21
Junio C Hamano
Merge branch 'jn/gitweb-unborn-head'
blob
|
commitdiff
|
raw
2012-02-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2012-02-21
Junio C Hamano
Merge branch 'cb/receive-pack-keep-errors' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'jk/git-dir-lookup' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'jc/diff-stat-scaler' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'zj/term-columns' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'cb/maint-rev-list-verify-object' into...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'cb/maint-t5541-make-server-port-portable...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-20
Junio C Hamano
Merge branch 'tg/tag-points-at'
blob
|
commitdiff
|
raw
2012-02-20
Junio C Hamano
Merge branch 'jc/diff-stat-scaler'
blob
|
commitdiff
|
raw
2012-02-20
Junio C Hamano
Merge branch 'zj/decimal-width'
blob
|
commitdiff
|
raw
2012-02-20
Junio C Hamano
Merge branch 'zj/term-columns'
blob
|
commitdiff
|
raw
2012-02-20
Junio C Hamano
Merge branch 'cb/transfer-no-progress'
blob
|
commitdiff
|
raw
2012-02-20
Junio C Hamano
Merge branch 'cb/receive-pack-keep-errors'
blob
|
commitdiff
|
raw
2012-02-20
Junio C Hamano
Merge branch 'cb/maint-t5541-make-server-port-portable'
blob
|
commitdiff
|
raw
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
