git.oblomov.eu Git - git/history - git-mergetool--lib.sh

2013-10-23	Junio C Hamano	Sync with 'maint'	blob \| commitdiff \| raw
2013-10-23	Junio C Hamano	Merge branch 'jc/ls-files-killed-optim' into maint	blob \| commitdiff \| raw \| diff to current
2013-10-23	Junio C Hamano	Merge branch 'jh/checkout-auto-tracking' into maint	blob \| commitdiff \| raw \| diff to current
2013-10-23	Junio C Hamano	Merge branch 'bc/gnome-keyring'	blob \| commitdiff \| raw
2013-10-23	Junio C Hamano	Merge branch 'po/dot-url'	blob \| commitdiff \| raw
2013-10-23	Junio C Hamano	Merge branch 'jc/prompt-upstream'	blob \| commitdiff \| raw
2013-10-23	Junio C Hamano	Merge branch 'hu/cherry-pick-previous-branch'	blob \| commitdiff \| raw
2013-10-23	Junio C Hamano	Merge branch 'mg/more-textconv'	blob \| commitdiff \| raw
2013-10-23	Junio C Hamano	Merge branch 'jc/pack-objects'	blob \| commitdiff \| raw
2013-10-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2013-10-18	Junio C Hamano	Merge branch 'jc/reflog-doc'	blob \| commitdiff \| raw
2013-10-18	Junio C Hamano	Merge branch 'sb/repack-in-c'	blob \| commitdiff \| raw
2013-10-18	Junio C Hamano	Merge branch 'jk/clone-progress-to-stderr'	blob \| commitdiff \| raw
2013-10-17	Junio C Hamano	Merge branch 'jk/format-patch-from'	blob \| commitdiff \| raw
2013-10-17	Junio C Hamano	Merge branch 'es/name-hash-no-trailing-slash-in-dirs'	blob \| commitdiff \| raw
2013-10-17	Junio C Hamano	Merge branch 'jk/trailing-slash-in-pathspec'	blob \| commitdiff \| raw
2013-10-17	Junio C Hamano	Merge branch 'lc/filter-branch-too-many-refs'	blob \| commitdiff \| raw
2013-10-17	Junio C Hamano	Merge branch 'jc/checkout-detach-doc'	blob \| commitdiff \| raw
2013-10-17	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2013-10-17	Junio C Hamano	Merge branch 'jk/upload-pack-keepalive' into maint	blob \| commitdiff \| raw \| diff to current
2013-10-17	Junio C Hamano	Merge branch 'bc/http-backend-allow-405' into maint	blob \| commitdiff \| raw \| diff to current
2013-10-17	Junio C Hamano	Merge branch 'jc/cvsserver-perm-bit-fix' into maint	blob \| commitdiff \| raw \| diff to current
2013-10-17	Junio C Hamano	Merge branch 'nd/git-dir-pointing-at-gitfile' into...	blob \| commitdiff \| raw \| diff to current
2013-10-17	Junio C Hamano	Merge branch 'es/rebase-i-respect-core-commentchar...	blob \| commitdiff \| raw \| diff to current
2013-10-16	Junio C Hamano	Merge git://git.bogomips.org/git-svn	blob \| commitdiff \| raw
2013-10-15	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2013-10-14	Stefan Saasen	mergetool--lib: Fix typo in the merge/difftool help	blob \| commitdiff \| raw
2013-10-14	Jonathan Nieder	Merge branch 'rj/highlight-test-hang'	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'nv/doc-config-signingkey'	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'sb/checkout-test-complex-path'	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'rt/cherry-pick-status'	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'rj/doc-formatting-fix'	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'po/remote-set-head-usage'	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'nd/clone-local-with-colon'	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'jx/clean-interactive'	blob \| commitdiff \| raw \| diff to current
2013-10-14	Jonathan Nieder	Merge branch 'jk/diff-algo'	blob \| commitdiff \| raw \| diff to current
2013-10-13	Stefan Saasen	mergetools/diffmerge: support DiffMerge as a git mergetool	blob \| commitdiff \| raw \| diff to current
2013-10-08	Jonathan Nieder	Merge branch 'tz/credential-netrc'	blob \| commitdiff \| raw \| diff to current
2013-09-26	Jonathan Nieder	Merge branch 'mm/rebase-continue-freebsd-WB' into maint	blob \| commitdiff \| raw \| diff to current
2013-09-26	Jonathan Nieder	Merge branch 'km/svn-1.8-serf-only' into maint	blob \| commitdiff \| raw \| diff to current
2013-09-26	Jonathan Nieder	Merge branch 'js/xread-in-full' into maint	blob \| commitdiff \| raw \| diff to current
2013-09-26	Jonathan Nieder	Merge branch 'bc/send-email-ssl-die-message-fix' into...	blob \| commitdiff \| raw \| diff to current
2013-09-25	Jonathan Nieder	Merge branch 'jk/shortlog-tolerate-broken-commit'	blob \| commitdiff \| raw \| diff to current
2013-09-25	Jonathan Nieder	Merge branch 'nd/fetch-pack-error-reporting-fix'	blob \| commitdiff \| raw \| diff to current
2013-09-25	Jonathan Nieder	Merge branch 'jc/push-cas'	blob \| commitdiff \| raw \| diff to current
2013-09-20	Junio C Hamano	Merge branch 'jk/upload-pack-keepalive'	blob \| commitdiff \| raw \| diff to current
2013-09-20	Junio C Hamano	Merge branch 'mm/rebase-continue-freebsd-WB'	blob \| commitdiff \| raw \| diff to current
2013-09-20	Junio C Hamano	Merge branch 'jh/checkout-auto-tracking'	blob \| commitdiff \| raw \| diff to current
2013-09-20	Junio C Hamano	Merge branch 'bc/http-backend-allow-405'	blob \| commitdiff \| raw \| diff to current
2013-09-20	Junio C Hamano	Merge branch 'hu/cherry-pick-previous-branch'	blob \| commitdiff \| raw \| diff to current
2013-09-18	Junio C Hamano	Merge branch 'jl/some-submodule-config-are-not-boolean...	blob \| commitdiff \| raw \| diff to current
2013-09-18	Junio C Hamano	Merge branch 'tr/log-full-diff-keep-true-parents' into...	blob \| commitdiff \| raw \| diff to current
2013-09-18	Junio C Hamano	Merge branch 'jk/mailmap-incomplete-line' into maint	blob \| commitdiff \| raw \| diff to current
2013-09-18	Junio C Hamano	Merge branch 'jc/url-match'	blob \| commitdiff \| raw \| diff to current
2013-09-18	Junio C Hamano	Merge branch 'jc/cvsserver-perm-bit-fix'	blob \| commitdiff \| raw \| diff to current
2013-09-18	Junio C Hamano	Merge branch 'bc/send-email-ssl-die-message-fix'	blob \| commitdiff \| raw \| diff to current
2013-09-18	Junio C Hamano	Merge branch 'uh/git-svn-serf-fix'	blob \| commitdiff \| raw \| diff to current
2013-09-18	Junio C Hamano	Merge branch 'jk/duplicate-objects-in-packs'	blob \| commitdiff \| raw \| diff to current
2013-09-18	Junio C Hamano	Merge branch 'nd/git-dir-pointing-at-gitfile'	blob \| commitdiff \| raw \| diff to current
2013-09-17	Junio C Hamano	Merge branch 'dw/diff-no-index-doc'	blob \| commitdiff \| raw \| diff to current
2013-09-17	Junio C Hamano	Merge branch 'ab/gitweb-author-initials'	blob \| commitdiff \| raw \| diff to current
2013-09-17	Junio C Hamano	Merge branch 'jk/write-broken-index-with-nul-sha1'	blob \| commitdiff \| raw \| diff to current
2013-09-17	Junio C Hamano	Merge branch 'jx/clean-interactive'	blob \| commitdiff \| raw \| diff to current
2013-09-17	Junio C Hamano	Merge branch 'jk/free-tree-buffer'	blob \| commitdiff \| raw \| diff to current
2013-09-12	Junio C Hamano	Merge branch 'jc/pager-configuration-doc'	blob \| commitdiff \| raw \| diff to current
2013-09-12	Junio C Hamano	Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'	blob \| commitdiff \| raw \| diff to current
2013-09-12	Junio C Hamano	Merge branch 'mm/fast-import-feature-doc'	blob \| commitdiff \| raw \| diff to current
2013-09-11	Junio C Hamano	Merge branch 'jc/ls-files-killed-optim'	blob \| commitdiff \| raw \| diff to current
2013-09-11	Junio C Hamano	Merge branch 'tf/gitweb-ss-tweak'	blob \| commitdiff \| raw \| diff to current
2013-09-11	Junio C Hamano	Merge branch 'js/xread-in-full'	blob \| commitdiff \| raw \| diff to current
2013-09-11	Junio C Hamano	Merge branch 'es/rebase-i-respect-core-commentchar'	blob \| commitdiff \| raw \| diff to current
2013-09-09	Junio C Hamano	Merge branch 'nd/magic-pathspec'	blob \| commitdiff \| raw \| diff to current
2013-09-09	Junio C Hamano	Merge branch 'jk/mailmap-incomplete-line'	blob \| commitdiff \| raw \| diff to current
2013-09-09	Junio C Hamano	Merge branch 'jc/url-match'	blob \| commitdiff \| raw \| diff to current
2013-09-09	Junio C Hamano	Merge branch 'jl/submodule-mv'	blob \| commitdiff \| raw \| diff to current
2013-09-09	Junio C Hamano	Merge branch 'tr/log-full-diff-keep-true-parents'	blob \| commitdiff \| raw \| diff to current
2013-09-09	Junio C Hamano	Merge branch 'jk/cat-file-batch-optim'	blob \| commitdiff \| raw \| diff to current
2013-09-09	Junio C Hamano	Merge branch 'db/http-savecookies'	blob \| commitdiff \| raw \| diff to current
2013-09-09	Junio C Hamano	Merge branch 'jc/push-cas'	blob \| commitdiff \| raw \| diff to current
2013-09-09	Junio C Hamano	Merge branch 'nd/clone-connectivity-shortcut'	blob \| commitdiff \| raw \| diff to current
2013-09-09	Junio C Hamano	Merge branch 'jc/diff-filter-negation'	blob \| commitdiff \| raw \| diff to current
2013-09-09	Junio C Hamano	Merge branch 'ms/fetch-prune-configuration'	blob \| commitdiff \| raw \| diff to current
2013-09-05	Junio C Hamano	Merge branch 'nd/fetch-pack-shallow-fix' into maint	blob \| commitdiff \| raw \| diff to current
2013-09-05	Junio C Hamano	Merge branch 'hv/config-from-blob' into maint	blob \| commitdiff \| raw \| diff to current
2013-09-05	Junio C Hamano	Merge branch 'maint-1.8.3' into maint	blob \| commitdiff \| raw \| diff to current
2013-09-04	Junio C Hamano	Merge branch 'sb/parseopt-boolean-removal'	blob \| commitdiff \| raw \| diff to current
2013-09-04	Junio C Hamano	Merge branch 'jc/parseopt-command-modes'	blob \| commitdiff \| raw \| diff to current
2013-09-04	Junio C Hamano	Merge branch 'jl/some-submodule-config-are-not-boolean'	blob \| commitdiff \| raw \| diff to current
2013-09-04	Junio C Hamano	Merge branch 'sb/diff-delta-remove-needless-comparison'	blob \| commitdiff \| raw \| diff to current
2013-09-04	Junio C Hamano	Merge branch 'nd/gc-lock-against-each-other'	blob \| commitdiff \| raw \| diff to current
2013-09-04	Junio C Hamano	Merge branch 'tr/fd-gotcha-fixes'	blob \| commitdiff \| raw \| diff to current
2013-09-04	Junio C Hamano	Merge branch 'bc/unuse-packfile'	blob \| commitdiff \| raw \| diff to current
2013-09-04	Junio C Hamano	Merge branch 'da/darwin'	blob \| commitdiff \| raw \| diff to current
2013-09-04	Junio C Hamano	Merge branch 'nd/sq-quote-buf'	blob \| commitdiff \| raw \| diff to current
2013-09-04	Junio C Hamano	Merge branch 'rr/feed-real-path-to-editor'	blob \| commitdiff \| raw \| diff to current
2013-09-04	Junio C Hamano	Merge branch 'jk/fast-import-empty-ls'	blob \| commitdiff \| raw \| diff to current
2013-09-04	Junio C Hamano	Merge branch 'km/svn-1.8-serf-only'	blob \| commitdiff \| raw \| diff to current
2013-09-04	Junio C Hamano	Merge branch 'jc/check-x-z'	blob \| commitdiff \| raw \| diff to current
2013-09-03	Junio C Hamano	Merge branch 'maint-1.8.3' into maint	blob \| commitdiff \| raw \| diff to current
2013-08-30	Junio C Hamano	Merge branch 'rt/doc-merge-file-diff3'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom