tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
merge: use editor by default in interactive sessions
[git.git]
/
Documentation
/
merge-config.txt
2011-10-19
Junio C Hamano
Merge branch 'jm/maint-apply-detects-corrupt-patch...
blob
|
commitdiff
|
raw
2011-10-19
Junio C Hamano
Merge branch 'js/log-show-children'
blob
|
commitdiff
|
raw
2011-10-19
Junio C Hamano
Merge branch 'cb/httpd-test-fix-port'
blob
|
commitdiff
|
raw
2011-10-19
Junio C Hamano
Merge branch 'md/smtp-tls-hello-again'
blob
|
commitdiff
|
raw
2011-10-18
Junio C Hamano
Merge branch 'jk/pull-rebase-with-work-tree'
blob
|
commitdiff
|
raw
2011-10-18
Junio C Hamano
Merge branch 'sg/completion'
blob
|
commitdiff
|
raw
2011-10-18
Junio C Hamano
Merge branch 'mm/maint-config-explicit-bool-display'
blob
|
commitdiff
|
raw
2011-10-18
Junio C Hamano
Merge branch 'tm/completion-push-set-upstream'
blob
|
commitdiff
|
raw
2011-10-18
Junio C Hamano
Merge branch 'tm/completion-commit-fixup-squash'
blob
|
commitdiff
|
raw
2011-10-18
Junio C Hamano
Merge branch 'jc/checkout-from-tree-keep-local-changes'
blob
|
commitdiff
|
raw
2011-10-16
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2011-10-16
Junio C Hamano
Merge branch 'jc/maint-bundle-too-quiet' into maint
blob
|
commitdiff
|
raw
2011-10-16
Junio C Hamano
Merge branch 'bk/ancestry-path' into maint
blob
|
commitdiff
|
raw
2011-10-16
Junio C Hamano
Merge branch 'nm/grep-object-sha1-lock' into maint
blob
|
commitdiff
|
raw
2011-10-16
Junio C Hamano
Merge branch 'jc/maint-grep-untracked-exclude' into...
blob
|
commitdiff
|
raw
2011-10-14
Junio C Hamano
Merge branch 'js/maint-merge-one-file-osx-expr'
blob
|
commitdiff
|
raw
2011-10-14
Junio C Hamano
Merge branch 'il/archive-err-signal'
blob
|
commitdiff
|
raw
2011-10-14
Junio C Hamano
Merge branch 'jc/is-url-simplify'
blob
|
commitdiff
|
raw
2011-10-14
Junio C Hamano
Merge branch 'nd/git-daemon-error-msgs'
blob
|
commitdiff
|
raw
2011-10-14
Junio C Hamano
Merge branch 'jc/apply-blank-at-eof-fix'
blob
|
commitdiff
|
raw
2011-10-14
Junio C Hamano
Merge branch 'bw/grep-no-index-no-exclude'
blob
|
commitdiff
|
raw
2011-10-12
Junio C Hamano
Merge branch 'sp/smart-http-failure'
blob
|
commitdiff
|
raw
2011-10-12
Junio C Hamano
Merge branch 'nd/document-err-packet'
blob
|
commitdiff
|
raw
2011-10-12
Junio C Hamano
Merge branch 'rs/name-rev-usage'
blob
|
commitdiff
|
raw
2011-10-12
Junio C Hamano
Merge branch 'zj/send-email-authen-sasl'
blob
|
commitdiff
|
raw
2011-10-10
Junio C Hamano
Merge branch 'dm/tree-walk'
blob
|
commitdiff
|
raw
2011-10-10
Junio C Hamano
Merge branch 'ps/gitweb-js-with-lineno'
blob
|
commitdiff
|
raw
2011-10-10
Junio C Hamano
Merge branch 'jp/get-ref-dir-unsorted'
blob
|
commitdiff
|
raw
2011-10-10
Junio C Hamano
Merge branch 'jc/maint-diffstat-numstat-context'
blob
|
commitdiff
|
raw
2011-10-05
Junio C Hamano
Merge branch 'jc/ls-remote-short-help'
blob
|
commitdiff
|
raw
2011-10-05
Junio C Hamano
Merge branch 'sn/doc-update-index-assume-unchanged'
blob
|
commitdiff
|
raw
2011-10-05
Junio C Hamano
Merge branch 'rj/quietly-create-dep-dir'
blob
|
commitdiff
|
raw
2011-10-05
Junio C Hamano
Merge branch 'jc/fetch-pack-fsck-objects'
blob
|
commitdiff
|
raw
2011-10-05
Junio C Hamano
Merge branch 'gb/am-hg-patch'
blob
|
commitdiff
|
raw
2011-10-05
Junio C Hamano
Merge branch 'bc/unstash-clean-crufts'
blob
|
commitdiff
|
raw
2011-10-05
Junio C Hamano
Merge branch 'jc/maint-bundle-too-quiet'
blob
|
commitdiff
|
raw
2011-10-05
Junio C Hamano
Merge branch 'bk/ancestry-path'
blob
|
commitdiff
|
raw
2011-10-05
Junio C Hamano
Merge branch 'nm/grep-object-sha1-lock'
blob
|
commitdiff
|
raw
2011-10-05
Junio C Hamano
Merge branch 'jc/maint-grep-untracked-exclude' into...
blob
|
commitdiff
|
raw
2011-09-23
Junio C Hamano
Merge branch 'mh/check-ref-format-print-normalize'...
blob
|
commitdiff
|
raw
2011-09-23
Junio C Hamano
Merge branch 'gb/maint-am-patch-format-error-message...
blob
|
commitdiff
|
raw
2011-09-12
Junio C Hamano
Merge branch 'jk/tag-contains-ab' (early part) into...
blob
|
commitdiff
|
raw
2011-09-12
Junio C Hamano
Merge branch 'jk/maint-config-param' into maint
blob
|
commitdiff
|
raw
2011-09-12
Junio C Hamano
Merge branch 'jk/maint-1.7.2-status-ignored' into maint
blob
|
commitdiff
|
raw
2011-09-06
Junio C Hamano
Merge branch 'mh/check-ref-format-print-normalize'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'tr/maint-t3903-misquoted-command'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'gb/maint-am-stgit-author-to-from-fix'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'gb/maint-am-patch-format-error-message'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'bg/t5540-osx-grep'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'en/merge-recursive-2'
blob
|
commitdiff
|
raw
2011-08-25
Junio C Hamano
Merge branch 'jn/plug-empty-tree-leak'
blob
|
commitdiff
|
raw
2011-08-23
Junio C Hamano
Merge branch 'jc/maint-combined-diff-work-tree' into...
blob
|
commitdiff
|
raw
2011-08-18
Junio C Hamano
Merge branch 'jc/maint-combined-diff-work-tree'
blob
|
commitdiff
|
raw
2011-08-16
Junio C Hamano
Merge branch 'jk/tag-list-multiple-patterns' into maint
blob
|
commitdiff
|
raw
2011-08-16
Junio C Hamano
Merge branch 'jl/submodule-add-relurl-wo-upstream'...
blob
|
commitdiff
|
raw
2011-08-16
Junio C Hamano
Merge branch 'jk/fast-export-quote-path' into maint
blob
|
commitdiff
|
raw
2011-08-16
Junio C Hamano
Merge branch 'bw/log-all-ref-updates-doc' into maint
blob
|
commitdiff
|
raw
2011-08-16
Junio C Hamano
Merge branch 'js/maint-add-path-stat-pwd' into maint
blob
|
commitdiff
|
raw
2011-08-16
Junio C Hamano
Merge branch 'jn/mime-type-with-params' into maint
blob
|
commitdiff
|
raw
2011-08-16
Junio C Hamano
Merge branch 'jc/submodule-sync-no-auto-vivify' into...
blob
|
commitdiff
|
raw
2011-08-16
Junio C Hamano
Merge branch 'jc/zlib-wrap' into maint
blob
|
commitdiff
|
raw
2011-08-16
Junio C Hamano
Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
blob
|
commitdiff
|
raw
2011-08-16
Junio C Hamano
Merge branch 'jc/diff-index-quick-exit-early' into...
blob
|
commitdiff
|
raw
2011-08-11
Junio C Hamano
Merge branch 'jk/fast-export-quote-path'
blob
|
commitdiff
|
raw
2011-08-11
Junio C Hamano
Merge branch 'rc/maint-http-wrong-free'
blob
|
commitdiff
|
raw
2011-08-01
Junio C Hamano
Merge branch 'jk/clone-detached'
blob
|
commitdiff
|
raw
2011-08-01
Junio C Hamano
Merge branch 'jc/streaming-filter'
blob
|
commitdiff
|
raw
2011-08-01
Junio C Hamano
Merge branch 'nk/ref-doc' into maint
blob
|
commitdiff
|
raw
2011-08-01
Junio C Hamano
Merge branch 'jl/maint-fetch-recursive-fix' into maint
blob
|
commitdiff
|
raw
2011-08-01
Junio C Hamano
Merge branch 'jc/maint-cygwin-trust-executable-bit...
blob
|
commitdiff
|
raw
2011-08-01
Junio C Hamano
Merge branch 'jc/legacy-loose-object' into maint
blob
|
commitdiff
|
raw
2011-08-01
Junio C Hamano
Merge branch 'an/shallow-doc' into maint
blob
|
commitdiff
|
raw
2011-08-01
Junio C Hamano
Merge branch 'jc/maint-1.7.3-checkout-describe' into...
blob
|
commitdiff
|
raw
2011-07-22
Junio C Hamano
Merge branch 'dc/stash-con-untracked'
blob
|
commitdiff
|
raw
2011-07-22
Junio C Hamano
Merge branch 'jk/tag-contains-ab'
blob
|
commitdiff
|
raw
2011-07-22
Junio C Hamano
Merge branch 'bw/log-all-ref-updates-doc'
blob
|
commitdiff
|
raw
2011-07-22
Junio C Hamano
Merge branch 'js/maint-add-path-stat-pwd'
blob
|
commitdiff
|
raw
2011-07-22
Junio C Hamano
Merge branch 'jn/gitweb-search'
blob
|
commitdiff
|
raw
2011-07-22
Junio C Hamano
Merge branch 'jl/submodule-add-relurl-wo-upstream'
blob
|
commitdiff
|
raw
2011-07-19
Junio C Hamano
Merge branch 'jc/index-pack'
blob
|
commitdiff
|
raw
2011-07-19
Junio C Hamano
Merge branch 'jn/mime-type-with-params'
blob
|
commitdiff
|
raw
2011-07-19
Junio C Hamano
Merge branch 'jc/submodule-sync-no-auto-vivify'
blob
|
commitdiff
|
raw
2011-07-19
Junio C Hamano
Merge branch 'jk/clone-cmdline-config'
blob
|
commitdiff
|
raw
2011-07-19
Junio C Hamano
Merge branch 'jk/maint-config-param'
blob
|
commitdiff
|
raw
2011-07-19
Junio C Hamano
Merge branch 'jk/tag-list-multiple-patterns'
blob
|
commitdiff
|
raw
2011-07-19
Junio C Hamano
Merge branch 'jc/zlib-wrap'
blob
|
commitdiff
|
raw
2011-07-13
Junio C Hamano
Merge branch 'js/rebase-typo-branch-squelch-usage'
blob
|
commitdiff
|
raw
2011-07-13
Junio C Hamano
Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4'
blob
|
commitdiff
|
raw
2011-07-13
Junio C Hamano
Merge branch 'nk/ref-doc'
blob
|
commitdiff
|
raw
2011-07-13
Junio C Hamano
Merge branch 'jl/maint-fetch-recursive-fix'
blob
|
commitdiff
|
raw
2011-07-13
Junio C Hamano
Merge branch 'jc/maint-cygwin-trust-executable-bit...
blob
|
commitdiff
|
raw
2011-07-13
Junio C Hamano
Merge branch 'ln/gitweb-mime-types-split-at-blank'
blob
|
commitdiff
|
raw
2011-07-13
Junio C Hamano
Merge branch 'jc/legacy-loose-object'
blob
|
commitdiff
|
raw
2011-07-13
Junio C Hamano
Merge branch 'an/shallow-doc'
blob
|
commitdiff
|
raw
2011-07-06
Junio C Hamano
Merge commit 'v1.7.6' into jc/checkout-reflog-fix
blob
|
commitdiff
|
raw
2011-07-06
Junio C Hamano
Merge commit 'v1.7.0' into jc/checkout-reflog-fix
blob
|
commitdiff
|
raw
|
diff to current
2011-07-06
Junio C Hamano
Merge commit 'v1.6.0' into jc/checkout-reflog-fix
blob
|
commitdiff
|
raw
|
diff to current
2011-06-30
Junio C Hamano
Merge branch 'jc/streaming-filter' into next
blob
|
commitdiff
|
raw
2011-06-30
Junio C Hamano
Merge branch 'jn/gitweb-js-blame' into next
blob
|
commitdiff
|
raw
2011-06-30
Junio C Hamano
Merge branch 'da/git-prefix-everywhere' into next
blob
|
commitdiff
|
raw
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
