Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
attr: "binary" attribute should choose built-in "binary" merge driver
[gitweb.git]
/
t
/
t7610-mergetool.sh
2012-04-26
Sync with 1.7.8.6
blob
|
diff
|
raw
2012-04-10
Merge branch 'maint-1.7.8' into maint-1.7.9
blob
|
diff
|
raw
2012-03-26
Merge branch 'jn/maint-fast-import-empty-ls' into maint
blob
|
diff
|
raw
2012-03-26
Merge branch 'ph/rerere-doc' into maint
blob
|
diff
|
raw
2012-03-26
Merge branch 'ms/maint-config-error-at-eol-linecount...
blob
|
diff
|
raw
2012-03-20
Merge branch 'maint-1.7.8' into maint
blob
|
diff
|
raw
2012-03-12
Merge branch 'tr/maint-bundle-boundary' into maint
blob
|
diff
|
raw
2012-03-12
Merge branch 'jc/maint-diff-patch-header' into maint
blob
|
diff
|
raw
2012-03-12
Merge branch 'jn/maint-do-not-match-with-unsanitized...
blob
|
diff
|
raw
2012-03-12
Merge branch 'jc/am-3-nonstandard-popt' into maint
blob
|
diff
|
raw
2012-03-06
Merge branch 'maint-1.7.8' into maint
blob
|
diff
|
raw
2012-03-05
Merge branch 'jc/doc-merge-options' into maint
blob
|
diff
|
raw
2012-03-05
Merge branch 'cn/maint-rev-list-doc' into maint
blob
|
diff
|
raw
2012-03-05
Merge branch 'cn/maint-branch-with-bad' into maint
blob
|
diff
|
raw
2012-03-05
Merge branch 'jn/maint-gitweb-invalid-regexp' into...
blob
|
diff
|
raw
2012-03-05
Merge branch 'nd/maint-verify-objects' into maint
blob
|
diff
|
raw
2012-03-05
Merge branch 'jk/maint-avoid-streaming-filtered-content...
blob
|
diff
|
raw
2012-03-05
Merge branch 'jb/filter-ignore-sigpipe' into maint
blob
|
diff
|
raw
2012-03-05
Merge branch 'sp/smart-http-failure-to-push' into maint
blob
|
diff
|
raw
2012-03-05
Merge branch 'tr/maint-bundle-long-subject' into maint
blob
|
diff
|
raw
2012-02-27
Merge branch 'pj/remote-set-branches-usage-fix' into...
blob
|
diff
|
raw
2012-02-27
Merge branch 'jn/ancient-meld-support' into maint
blob
|
diff
|
raw
2012-02-27
Merge branch 'tr/merge-edit-guidance' into maint
blob
|
diff
|
raw
2012-02-27
Merge branch 'js/configure-libintl' into maint
blob
|
diff
|
raw
2012-02-27
Sync with 1.7.8.5
blob
|
diff
|
raw
2012-02-21
Merge branch 'cb/receive-pack-keep-errors' into maint
blob
|
diff
|
raw
2012-02-21
Merge branch 'jk/git-dir-lookup' into maint
blob
|
diff
|
raw
2012-02-21
Merge branch 'jc/diff-stat-scaler' into maint
blob
|
diff
|
raw
2012-02-21
Merge branch 'zj/term-columns' into maint
blob
|
diff
|
raw
2012-02-21
Merge branch 'cb/maint-rev-list-verify-object' into...
blob
|
diff
|
raw
2012-02-21
Merge branch 'cb/maint-t5541-make-server-port-portable...
blob
|
diff
|
raw
2012-02-21
Merge branch 'dp/i18n-libcharset' into maint
blob
|
diff
|
raw
2012-02-21
Merge branch 'jk/grep-binary-attribute' into maint
blob
|
diff
|
raw
2012-02-21
Merge branch 'nd/diffstat-gramnum' into maint
blob
|
diff
|
raw
2012-02-21
Merge branch 'nd/find-pack-entry-recent-cache-invalidat...
blob
|
diff
|
raw
2012-02-21
Merge branch 'tt/profile-build-fix' into maint
blob
|
diff
|
raw
2012-02-21
Merge branch 'fc/zsh-completion' into maint
blob
|
diff
|
raw
2012-02-16
Merge branch 'jc/checkout-out-of-unborn' into maint
blob
|
diff
|
raw
2012-02-16
Merge branch 'jc/maint-mailmap-output' into maint
blob
|
diff
|
raw
2012-02-16
Merge branch 'jk/prompt-fallback-to-tty' into maint
blob
|
diff
|
raw
2012-02-16
Merge branch 'jn/gitweb-search-utf-8' into maint
blob
|
diff
|
raw
2012-02-16
Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
blob
|
diff
|
raw
2012-02-16
Merge branch 'mm/empty-loose-error-message' into maint
blob
|
diff
|
raw
2012-02-16
Merge branch 'nk/ctype-for-perf' into maint
blob
|
diff
|
raw
2012-02-16
Merge branch 'jx/i18n-more-marking' into maint
blob
|
diff
|
raw
2012-02-16
Merge branch 'rt/completion-branch-edit-desc' into...
blob
|
diff
|
raw
2012-02-14
Merge branch 'jk/maint-tag-show-fixes' into maint
blob
|
diff
|
raw
2012-02-14
Merge branch 'bw/inet-pton-ntop-compat' into maint
blob
|
diff
|
raw
2012-02-14
Merge branch 'mp/make-cleanse-x-for-exe' into maint
blob
|
diff
|
raw
2012-02-14
Merge branch 'jn/merge-no-edit-fix' into maint
blob
|
diff
|
raw
2012-02-13
Merge branch 'js/add-e-submodule-fix' into maint
blob
|
diff
|
raw
2012-02-13
Merge branch 'jc/parse-date-raw' into maint
blob
|
diff
|
raw
2012-02-13
Merge branch 'jc/merge-ff-only-stronger-than-signed...
blob
|
diff
|
raw
2012-02-13
Merge branch 'jc/branch-desc-typoavoidance' into maint
blob
|
diff
|
raw
2012-02-13
Merge branch 'jn/rpm-spec' into maint
blob
|
diff
|
raw
2012-02-10
Merge branch 'jc/maint-request-pull-for-tag' into maint
blob
|
diff
|
raw
2012-02-10
Merge branch 'tr/grep-l-with-decoration' into maint
blob
|
diff
|
raw
2012-02-10
Merge branch 'jl/submodule-re-add' into maint
blob
|
diff
|
raw
2012-02-10
Merge branch 'da/maint-mergetool-twoway' into maint
blob
|
diff
|
raw
2012-01-23
mergetool: Provide an empty file when needed
blob
|
diff
|
raw
2012-01-13
Merge branch 'jc/request-pull-show-head-4'
blob
|
diff
|
raw
|
diff to current
2012-01-13
Merge branch 'tr/maint-mailinfo'
blob
|
diff
|
raw
|
diff to current
2012-01-09
Merge branch 'mm/maint-gitweb-project-maxdepth'
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jv/maint-config-set' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jc/checkout-m-twoway' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'tr/doc-sh-setup' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jk/maint-strbuf-missing-init' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jk/maint-snprintf-va-copy' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'na/strtoimax' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-22
Merge branch 'tr/doc-sh-setup'
blob
|
diff
|
raw
|
diff to current
2011-12-22
Merge branch 'tr/pty-all'
blob
|
diff
|
raw
|
diff to current
2011-12-22
Merge branch 'jk/maint-strbuf-missing-init'
blob
|
diff
|
raw
|
diff to current
2011-12-22
Merge branch 'jc/maint-lf-to-crlf-keep-crlf'
blob
|
diff
|
raw
|
diff to current
2011-12-22
Merge branch 'jk/maint-do-not-feed-stdin-to-tests'
blob
|
diff
|
raw
|
diff to current
2011-12-22
Merge branch 'jn/test-cleanup-7006'
blob
|
diff
|
raw
|
diff to current
2011-12-21
Merge branch 'jl/submodule-status-failure-report' into...
blob
|
diff
|
raw
|
diff to current
2011-12-21
Merge branch 'tr/userdiff-c-returns-pointer' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-21
Merge branch 'cn/maint-lf-to-crlf-filter' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-21
Merge branch 'ms/commit-cc-option-helpstring' into...
blob
|
diff
|
raw
|
diff to current
2011-12-20
Merge branch 'jc/request-pull-show-head-4'
blob
|
diff
|
raw
|
diff to current
2011-12-20
Merge branch 'jc/checkout-m-twoway'
blob
|
diff
|
raw
|
diff to current
2011-12-20
Merge branch 'jc/checkout-m-twoway'
blob
|
diff
|
raw
|
diff to current
2011-12-20
Merge branch 'jk/maint-snprintf-va-copy'
blob
|
diff
|
raw
|
diff to current
2011-12-18
Update jk/maint-strbuf-missing-init to builtin/ rename
blob
|
diff
|
raw
|
diff to current
2011-12-17
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jl/submodule-status-failure-report'
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'tr/userdiff-c-returns-pointer'
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'cn/maint-lf-to-crlf-filter'
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jc/maint-pack-object-cycle' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jc/index-pack-reject-dups' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'mf/curl-select-fdset' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'ab/clang-lints' into maint-1.7.7
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jk/maint-fetch-status-table' into maint...
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jc/maint-name-rev-all' into maint-1.7.6
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'ml/mailmap' into maint-1.7.6
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2011-12-09
Merge branch 'jc/request-pull-show-head-4'
blob
|
diff
|
raw
|
diff to current
2011-12-09
Merge branch 'ab/pull-rebase-config'
blob
|
diff
|
raw
|
diff to current
next