projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'master' of git://github.com/vnwildman/git
[git]
/
Documentation
/
git-merge.txt
2012-10-08
Junio C Hamano
Merge branch 'jc/maint-t1450-fsck-order-fix'
blob
|
commitdiff
|
raw
2012-10-08
Junio C Hamano
Merge branch 'jc/merge-bases-paint-fix'
blob
|
commitdiff
|
raw
2012-10-08
Junio C Hamano
Merge branch 'os/commit-submodule-ignore' into maint
blob
|
commitdiff
|
raw
2012-10-08
Junio C Hamano
Merge branch 'lt/mailinfo-handle-attachment-more-sanely...
blob
|
commitdiff
|
raw
2012-10-03
Junio C Hamano
Merge branch 'lt/mailinfo-handle-attachment-more-sanely'
blob
|
commitdiff
|
raw
2012-10-01
Junio C Hamano
Merge branch 'os/commit-submodule-ignore'
blob
|
commitdiff
|
raw
2012-09-30
Junio C Hamano
Merge branch 'jc/maint-log-grep-all-match-1' into maint
blob
|
commitdiff
|
raw
2012-09-30
Junio C Hamano
Merge branch 'jc/maint-mailinfo-mime-attr' into maint
blob
|
commitdiff
|
raw
2012-09-25
Junio C Hamano
Merge branch 'jc/maint-mailinfo-mime-attr'
blob
|
commitdiff
|
raw
2012-09-24
Junio C Hamano
Merge branch 'jc/maint-blame-no-such-path' into maint
blob
|
commitdiff
|
raw
2012-09-24
Junio C Hamano
Merge branch 'dj/fetch-all-tags' into maint
blob
|
commitdiff
|
raw
2012-09-21
Junio C Hamano
Merge branch 'jc/maint-log-grep-all-match-1'
blob
|
commitdiff
|
raw
2012-09-20
Junio C Hamano
Merge branch 'dg/run-command-child-cleanup' into maint
blob
|
commitdiff
|
raw
2012-09-20
Junio C Hamano
Merge branch 'sn/ls-remote-get-url-doc' into maint
blob
|
commitdiff
|
raw
2012-09-20
Junio C Hamano
Merge branch 'nd/log-n-doc' into maint
blob
|
commitdiff
|
raw
2012-09-18
Junio C Hamano
Merge branch 'jc/maint-log-grep-all-match'
blob
|
commitdiff
|
raw
2012-09-18
Junio C Hamano
Merge branch 'er/doc-fast-import-done' into maint
blob
|
commitdiff
|
raw
2012-09-17
Junio C Hamano
Merge branch 'jc/maint-blame-no-such-path'
blob
|
commitdiff
|
raw
2012-09-15
Junio C Hamano
Merge branch 'jc/ll-merge-binary-ours'
blob
|
commitdiff
|
raw
2012-09-15
Junio C Hamano
Merge branch 'dg/run-command-child-cleanup'
blob
|
commitdiff
|
raw
2012-09-15
Junio C Hamano
Merge branch 'sb/send-email-reconfirm-fix' into maint
blob
|
commitdiff
|
raw
2012-09-15
Junio C Hamano
Merge branch 'jc/send-email-reconfirm' into maint
blob
|
commitdiff
|
raw
2012-09-15
Junio C Hamano
Merge branch 'mz/cherry-pick-cmdline-order' into maint
blob
|
commitdiff
|
raw
2012-09-15
Junio C Hamano
Merge branch 'rj/test-regex' into maint-1.7.11
blob
|
commitdiff
|
raw
2012-09-15
Junio C Hamano
Merge branch 'da/gitk-reload-tag-contents' into maint...
blob
|
commitdiff
|
raw
2012-09-15
Junio C Hamano
Merge branch 'jc/maint-checkout-fileglob-doc' into...
blob
|
commitdiff
|
raw
2012-09-14
Junio C Hamano
Merge branch 'dj/fetch-all-tags'
blob
|
commitdiff
|
raw
2012-09-14
Junio C Hamano
Merge branch 'sn/ls-remote-get-url-doc'
blob
|
commitdiff
|
raw
2012-09-12
Junio C Hamano
Merge branch 'jc/maint-checkout-fileglob-doc'
blob
|
commitdiff
|
raw
2012-09-12
Junio C Hamano
Merge branch 'sb/send-email-reconfirm-fix'
blob
|
commitdiff
|
raw
2012-09-12
Junio C Hamano
Merge branch 'nd/log-n-doc'
blob
|
commitdiff
|
raw
2012-09-12
Junio C Hamano
Merge branch 'jc/apply-binary-p0' into maint-1.7.11
blob
|
commitdiff
|
raw
2012-09-12
Junio C Hamano
Merge branch 'jc/maint-doc-checkout-b-always-takes...
blob
|
commitdiff
|
raw
2012-09-12
Junio C Hamano
Merge branch 'jk/maint-http-half-auth-push' into maint...
blob
|
commitdiff
|
raw
2012-09-12
Junio C Hamano
Merge branch 'kk/maint-for-each-ref-multi-sort' into...
blob
|
commitdiff
|
raw
2012-09-12
Junio C Hamano
Merge git://ozlabs.org/~paulus/gitk
blob
|
commitdiff
|
raw
2012-09-12
Junio C Hamano
Merge branch 'da/gitk-reload-tag-contents'
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'rj/test-regex'
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'jk/argv-array'
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'jc/merge-bases'
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'sz/submodule-force-update' into maint...
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'ph/stash-rerere' into maint-1.7.11
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'jc/maint-sane-execvp-notdir' into maint...
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'jc/maint-config-exit-status' into maint...
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'mh/maint-config-doc-proxy-command' into...
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'mz/empty-rebase-test' into maint-1.7.11
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'jk/docs-docbook-monospace-display' into...
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'ab/diff-write-incomplete-line' into maint...
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'jc/maint-t7406-rev-parse-max-count-huh...
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'rr/precompose-utf8-cleanup' into maint
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'jc/capabilities' into maint
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'jc/doc-git-updates' into maint
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'tr/void-diff-setup-done' into maint-1...
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'tr/merge-recursive-flush' into maint...
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'nd/index-errno' into maint-1.7.11
blob
|
commitdiff
|
raw
2012-09-11
Junio C Hamano
Merge branch 'pg/maint-apply-remove-unused-variable...
blob
|
commitdiff
|
raw
2012-09-10
Junio C Hamano
Merge branch 'mz/cherry-pick-cmdline-order'
blob
|
commitdiff
|
raw
2012-09-10
Junio C Hamano
Merge branch 'mg/rebase-i-onto-reflog-in-full' into...
blob
|
commitdiff
|
raw
2012-09-10
Junio C Hamano
Merge branch 'jc/maint-protect-sh-from-ifs' into maint...
blob
|
commitdiff
|
raw
2012-09-10
Junio C Hamano
Merge branch 'bc/receive-pack-stdout-protection' into...
blob
|
commitdiff
|
raw
2012-09-10
Junio C Hamano
Merge branch 'jk/maint-null-in-trees' into maint-1...
blob
|
commitdiff
|
raw
2012-09-10
Junio C Hamano
Merge branch 'tr/maint-send-email-2047' into maint...
blob
|
commitdiff
|
raw
2012-09-10
Junio C Hamano
Merge branch 'mm/die-with-dashdash-help' into maint...
blob
|
commitdiff
|
raw
2012-09-10
Junio C Hamano
Merge branch 'js/gitweb-path-info-unquote' into maint...
blob
|
commitdiff
|
raw
2012-09-07
Junio C Hamano
Merge branch 'jk/maint-http-half-auth-push'
blob
|
commitdiff
|
raw
2012-09-07
Junio C Hamano
Merge branch 'jc/maint-doc-checkout-b-always-takes...
blob
|
commitdiff
|
raw
2012-09-07
Junio C Hamano
Merge branch 'jc/apply-binary-p0'
blob
|
commitdiff
|
raw
2012-09-07
Junio C Hamano
Merge branch 'nd/am-i18n-fix'
blob
|
commitdiff
|
raw
2012-09-07
Junio C Hamano
Merge branch 'kk/maint-for-each-ref-multi-sort'
blob
|
commitdiff
|
raw
2012-09-07
Junio C Hamano
Merge branch 'lt/commit-tree-guess-utf-8'
blob
|
commitdiff
|
raw
2012-09-07
Junio C Hamano
Merge branch 'tr/maint-parseopt-avoid-empty'
blob
|
commitdiff
|
raw
2012-09-03
Junio C Hamano
Merge branch 'sz/submodule-force-update'
blob
|
commitdiff
|
raw
2012-09-03
Junio C Hamano
Merge branch 'ph/stash-rerere'
blob
|
commitdiff
|
raw
2012-09-03
Junio C Hamano
Merge branch 'jc/daemon-access-hook'
blob
|
commitdiff
|
raw
2012-09-03
Junio C Hamano
Merge branch 'jc/send-email-reconfirm'
blob
|
commitdiff
|
raw
2012-09-03
Junio C Hamano
Merge branch 'cw/cherry-pick-allow-empty-message'
blob
|
commitdiff
|
raw
2012-09-03
Junio C Hamano
Merge branch 'jc/maint-sane-execvp-notdir'
blob
|
commitdiff
|
raw
2012-09-03
Junio C Hamano
Merge branch 'jc/maint-config-exit-status'
blob
|
commitdiff
|
raw
2012-08-29
Junio C Hamano
Merge branch 'rr/precompose-utf8-cleanup'
blob
|
commitdiff
|
raw
2012-08-29
Junio C Hamano
Merge branch 'mh/maint-config-doc-proxy-command'
blob
|
commitdiff
|
raw
2012-08-29
Junio C Hamano
Merge branch 'jc/capabilities'
blob
|
commitdiff
|
raw
2012-08-29
Junio C Hamano
Merge branch 'mg/rebase-i-onto-reflog-in-full'
blob
|
commitdiff
|
raw
2012-08-29
Junio C Hamano
Merge branch 'mz/empty-rebase-test'
blob
|
commitdiff
|
raw
2012-08-29
Junio C Hamano
Merge branch 'jc/maint-protect-sh-from-ifs'
blob
|
commitdiff
|
raw
2012-08-27
Junio C Hamano
Merge branch 'jk/docs-docbook-monospace-display'
blob
|
commitdiff
|
raw
2012-08-27
Junio C Hamano
Merge branch 'da/difftool-updates'
blob
|
commitdiff
|
raw
2012-08-27
Junio C Hamano
Merge branch 'js/grep-patterntype-config'
blob
|
commitdiff
|
raw
2012-08-27
Junio C Hamano
Merge branch 'bc/receive-pack-stdout-protection'
blob
|
commitdiff
|
raw
2012-08-27
Junio C Hamano
Merge branch 'ab/diff-write-incomplete-line'
blob
|
commitdiff
|
raw
2012-08-27
Junio C Hamano
Merge branch 'jc/maint-t7406-rev-parse-max-count-huh'
blob
|
commitdiff
|
raw
2012-08-27
Junio C Hamano
Merge branch 'jk/maint-null-in-trees'
blob
|
commitdiff
|
raw
2012-08-27
Junio C Hamano
Merge branch 'mm/push-default-switch-warning'
blob
|
commitdiff
|
raw
2012-08-24
Junio C Hamano
Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11
blob
|
commitdiff
|
raw
2012-08-24
Junio C Hamano
Merge branch 'jc/maint-abbrev-option-cli' into maint...
blob
|
commitdiff
|
raw
2012-08-24
Junio C Hamano
Merge branch 'jc/maint-rev-list-topo-doc' into maint...
blob
|
commitdiff
|
raw
2012-08-24
Junio C Hamano
Merge branch 'hv/coding-guidelines' into maint-1.7.11
blob
|
commitdiff
|
raw
2012-08-24
Junio C Hamano
Merge branch 'jc/tag-doc' into maint-1.7.11
blob
|
commitdiff
|
raw
2012-08-24
Junio C Hamano
Merge branch 'mk/test-seq' into maint-1.7.11
blob
|
commitdiff
|
raw
2012-08-24
Junio C Hamano
Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
blob
|
commitdiff
|
raw
2012-08-24
Junio C Hamano
Merge branch 'bw/maint-1.7.9-solaris-getpass' into...
blob
|
commitdiff
|
raw
next
projects / git / history
Junio C Hamano