projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'rs/run-command-use-alloc-array'
[git]
/
Documentation
/
merge-strategies.txt
2017-10-05
Junio C Hamano
Merge branch 'rs/run-command-use-alloc-array'
blob
|
commitdiff
|
raw
2017-10-05
Junio C Hamano
Merge branch 'sb/git-clang-format'
blob
|
commitdiff
|
raw
2017-10-05
Junio C Hamano
Merge branch 'rs/tag-null-pointer-arith-fix'
blob
|
commitdiff
|
raw
2017-10-05
Junio C Hamano
Merge branch 'rs/cocci-de-paren-call-params'
blob
|
commitdiff
|
raw
2017-10-05
Junio C Hamano
Merge branch 'rs/resolve-ref-optional-result'
blob
|
commitdiff
|
raw
2017-10-05
Junio C Hamano
Merge branch 'er/fast-import-dump-refs-on-checkpoint'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'bw/git-clang-format'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'ad/doc-markup-fix'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'mh/mmap-packed-refs'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'mr/doc-negative-pathspec'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'sb/submodule-diff-header-fix'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'sb/diff-color-move'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'sb/test-submodule-update-config'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'jk/validate-headref-fix'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'jk/read-in-full'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'jk/no-optional-locks'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'hn/string-list-doc'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'hn/path-ownership-comment'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'hn/submodule-comment'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'sd/branch-copy'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'bc/rev-parse-parseopt-fix'
blob
|
commitdiff
|
raw
2017-10-03
Junio C Hamano
Merge branch 'js/rebase-i-final'
blob
|
commitdiff
|
raw
2017-09-29
Junio C Hamano
Merge branch 'sb/doc-config-submodule-update'
blob
|
commitdiff
|
raw
2017-09-29
Junio C Hamano
Merge branch 'ma/leakplugs'
blob
|
commitdiff
|
raw
2017-09-29
Junio C Hamano
Merge branch 'rj/no-sign-compare'
blob
|
commitdiff
|
raw
2017-09-29
Junio C Hamano
Merge branch 'sb/merge-commit-msg-hook'
blob
|
commitdiff
|
raw
2017-09-29
Junio C Hamano
Merge branch 'jt/fast-export-copy-modify-fix'
blob
|
commitdiff
|
raw
2017-09-29
Junio C Hamano
Merge branch 'mk/describe-match-with-all'
blob
|
commitdiff
|
raw
2017-09-29
Junio C Hamano
Merge branch 'jm/status-ignored-directory-optim'
blob
|
commitdiff
|
raw
2017-09-28
Junio C Hamano
Merge branch 'js/win32-lazyload-dll'
blob
|
commitdiff
|
raw
2017-09-28
Junio C Hamano
Merge branch 'jc/merge-x-theirs-docfix'
blob
|
commitdiff
|
raw
2017-09-25
Junio C Hamano
merge-strategies: avoid implying that "-s theirs" exists
blob
|
commitdiff
|
raw
2017-07-30
Junio C Hamano
Merge tag 'v2.7.6' into maint-2.8
blob
|
commitdiff
|
raw
|
diff to current
2017-07-25
Junio C Hamano
Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2017-06-24
Junio C Hamano
Merge branch 'jc/diff-tree-stale-comment' into maint
blob
|
commitdiff
|
raw
|
diff to current
2017-06-24
Junio C Hamano
Merge branch 'jk/pack-idx-corruption-safety' into maint
blob
|
commitdiff
|
raw
|
diff to current
2017-06-13
Junio C Hamano
Merge branch 'jk/pack-idx-corruption-safety'
blob
|
commitdiff
|
raw
|
diff to current
2017-06-13
Junio C Hamano
Merge branch 'jc/diff-tree-stale-comment'
blob
|
commitdiff
|
raw
|
diff to current
2017-06-05
Junio C Hamano
Merge branch 'sg/core-filemode-doc-typofix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2017-05-29
Junio C Hamano
Merge branch 'sg/core-filemode-doc-typofix'
blob
|
commitdiff
|
raw
|
diff to current
2017-05-05
Junio C Hamano
Merge branch 'maint-2.7' into maint-2.8
blob
|
commitdiff
|
raw
|
diff to current
2017-05-01
Junio C Hamano
Merge branch 'jk/prio-queue-avoid-swap-with-self'
blob
|
commitdiff
|
raw
|
diff to current
2017-04-17
Junio C Hamano
Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
blob
|
commitdiff
|
raw
|
diff to current
2017-04-17
Junio C Hamano
Merge branch 'jc/unused-symbols'
blob
|
commitdiff
|
raw
|
diff to current
2017-04-11
Junio C Hamano
Merge branch 'cc/untracked'
blob
|
commitdiff
|
raw
|
diff to current
2017-03-30
Junio C Hamano
Merge branch 'bc/push-cert-receive-fix'
blob
|
commitdiff
|
raw
|
diff to current
2017-03-30
Junio C Hamano
Merge branch 'jc/merge-drop-old-syntax'
blob
|
commitdiff
|
raw
|
diff to current
2017-03-28
Junio C Hamano
Merge branch 'rs/path-name-safety-cleanup' into maint
blob
|
commitdiff
|
raw
|
diff to current
2017-03-24
Junio C Hamano
Merge branch 'rs/path-name-safety-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2017-03-21
Junio C Hamano
Merge branch 'jk/ewah-use-right-type-in-sizeof' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-03-13
Junio C Hamano
Merge branch 'jk/ewah-use-right-type-in-sizeof'
blob
|
commitdiff
|
raw
|
diff to current
2017-02-24
Junio C Hamano
Merge branch 'bc/worktree-doc-fix-detached'
blob
|
commitdiff
|
raw
|
diff to current
2017-02-16
Junio C Hamano
Merge branch 'ls/p4-path-encoding'
blob
|
commitdiff
|
raw
|
diff to current
2017-02-10
Junio C Hamano
Merge branch 'ps/worktree-prune-help-fix'
blob
|
commitdiff
|
raw
|
diff to current
2017-01-31
Junio C Hamano
Merge branch 'ad/bisect-terms' into maint
blob
|
commitdiff
|
raw
|
diff to current
2017-01-23
Junio C Hamano
Merge branch 'ad/bisect-terms'
blob
|
commitdiff
|
raw
|
diff to current
2017-01-18
Junio C Hamano
Merge git://ozlabs.org/~paulus/gitk
blob
|
commitdiff
|
raw
|
diff to current
2017-01-17
Junio C Hamano
Merge branch 'sb/t3600-cleanup' into maint
blob
|
commitdiff
|
raw
|
diff to current
2017-01-17
Junio C Hamano
Merge branch 'jc/pull-rebase-ff' into maint
blob
|
commitdiff
|
raw
|
diff to current
2017-01-17
Junio C Hamano
Merge branch 'bb/unicode-9.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-12-19
Junio C Hamano
Merge branch 'sb/t3600-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2016-12-19
Junio C Hamano
Merge branch 'jc/pull-rebase-ff'
blob
|
commitdiff
|
raw
|
diff to current
2016-12-19
Junio C Hamano
Merge branch 'bb/unicode-9.0'
blob
|
commitdiff
|
raw
|
diff to current
2016-11-29
Junio C Hamano
Merge branch 'mm/send-email-cc-cruft-after-address...
blob
|
commitdiff
|
raw
|
diff to current
2016-10-28
Junio C Hamano
Merge branch 'jk/tighten-alloc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-10-26
Junio C Hamano
Merge branch 'mm/send-email-cc-cruft-after-address'
blob
|
commitdiff
|
raw
|
diff to current
2016-10-26
Junio C Hamano
Merge branch 'jk/tighten-alloc'
blob
|
commitdiff
|
raw
|
diff to current
2016-10-26
Junio C Hamano
Merge branch 'jc/ws-error-highlight'
blob
|
commitdiff
|
raw
|
diff to current
2016-10-20
Junio C Hamano
Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2016-10-11
Junio C Hamano
Merge branch 'jc/verify-loose-object-header' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-10-10
Junio C Hamano
Merge branch 'nd/shallow-deepen'
blob
|
commitdiff
|
raw
|
diff to current
2016-10-03
Junio C Hamano
Merge branch 'jc/verify-loose-object-header'
blob
|
commitdiff
|
raw
|
diff to current
2016-09-29
Junio C Hamano
Merge branch 'ls/travis-homebrew-path-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-09-29
Junio C Hamano
Merge branch 'ep/doc-check-ref-format-example' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-09-29
Junio C Hamano
Merge branch 'jk/reduce-gc-aggressive-depth' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-09-29
Junio C Hamano
Merge branch 'ew/http-do-not-forget-to-call-curl-multi...
blob
|
commitdiff
|
raw
|
diff to current
2016-09-29
Junio C Hamano
Merge branch 'mr/vcs-svn-printf-ulong' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-09-26
Junio C Hamano
Merge branch 'ls/travis-homebrew-path-fix'
blob
|
commitdiff
|
raw
|
diff to current
2016-09-26
Junio C Hamano
Merge branch 'ep/doc-check-ref-format-example'
blob
|
commitdiff
|
raw
|
diff to current
2016-09-26
Junio C Hamano
Merge branch 'va/i18n' of ../git-gui into va/git-gui...
blob
|
commitdiff
|
raw
|
diff to current
2016-09-26
Junio C Hamano
Merge branch 'rs/use-modern-git-merge-syntax' of git...
blob
|
commitdiff
|
raw
|
diff to current
2016-09-21
Junio C Hamano
Merge branch 'jk/reduce-gc-aggressive-depth'
blob
|
commitdiff
|
raw
|
diff to current
2016-09-21
Junio C Hamano
Merge branch 'mr/vcs-svn-printf-ulong'
blob
|
commitdiff
|
raw
|
diff to current
2016-09-21
Junio C Hamano
Merge branch 'ew/http-do-not-forget-to-call-curl-multi...
blob
|
commitdiff
|
raw
|
diff to current
2016-09-19
Junio C Hamano
Merge branch 'po/range-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-09-11
Junio C Hamano
Merge branch 'js/commit-gpgsign' of ../git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2016-09-09
Junio C Hamano
Merge branch 'po/range-doc'
blob
|
commitdiff
|
raw
|
diff to current
2016-09-09
Junio C Hamano
Merge branch 'rs/mailinfo-lib' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-09-09
Junio C Hamano
Merge branch 'jk/tighten-alloc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-09-09
Junio C Hamano
Merge branch 'ls/packet-line-protocol-doc-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-09-09
Junio C Hamano
Merge branch 'js/import-tars-hardlinks' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-09-09
Junio C Hamano
Merge branch 'jk/push-force-with-lease-creation' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-09-07
Junio C Hamano
Merge branch 'sy/i18n' of git-gui
blob
|
commitdiff
|
raw
|
diff to current
2016-08-31
Junio C Hamano
Merge branch 'ls/packet-line-protocol-doc-fix'
blob
|
commitdiff
|
raw
|
diff to current
2016-08-17
Junio C Hamano
Merge branch 'rs/mailinfo-lib'
blob
|
commitdiff
|
raw
|
diff to current
2016-08-17
Junio C Hamano
Merge branch 'jk/tighten-alloc'
blob
|
commitdiff
|
raw
|
diff to current
2016-08-12
Junio C Hamano
Merge branch 'js/import-tars-hardlinks'
blob
|
commitdiff
|
raw
|
diff to current
2016-08-10
Junio C Hamano
Merge branch 'js/commit-slab-decl-fix'
blob
|
commitdiff
|
raw
|
diff to current
2016-08-10
Junio C Hamano
Merge branch 'jk/push-force-with-lease-creation'
blob
|
commitdiff
|
raw
|
diff to current
2016-08-10
Junio C Hamano
Merge branch 'cp/completion-clone-recurse-submodules...
blob
|
commitdiff
|
raw
|
diff to current
next
projects / git / history
Junio C Hamano