Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mh/submodule-hash'
[gitweb.git]
/
Documentation
/
git-merge.txt
2017-01-17
Merge branch 'jc/push-default-explicit' into maint
blob
|
diff
|
raw
2017-01-17
Merge branch 'jc/pull-rebase-ff' into maint
blob
|
diff
|
raw
2017-01-17
Merge branch 'jc/renormalize-merge-kill-safer-crlf...
blob
|
diff
|
raw
2017-01-17
Merge branch 'bb/unicode-9.0' into maint
blob
|
diff
|
raw
2017-01-10
Merge branch 'sb/submodule-embed-gitdir'
blob
|
diff
|
raw
|
diff to current
2017-01-10
Merge branch 'jc/retire-compaction-heuristics'
blob
|
diff
|
raw
|
diff to current
2017-01-10
Merge branch 'nd/config-misc-fixes'
blob
|
diff
|
raw
|
diff to current
2017-01-10
Merge branch 'jc/abbrev-autoscale-config'
blob
|
diff
|
raw
|
diff to current
2017-01-10
Merge branch 'mh/fast-import-notes-fix-new'
blob
|
diff
|
raw
|
diff to current
2017-01-10
Merge branch 'jc/git-open-cloexec'
blob
|
diff
|
raw
|
diff to current
2017-01-10
Merge branch 'jc/compression-config'
blob
|
diff
|
raw
|
diff to current
2017-01-10
Merge branch 'dt/smart-http-detect-server-going-away'
blob
|
diff
|
raw
|
diff to current
2017-01-10
Merge branch 'mm/gc-safety-doc'
blob
|
diff
|
raw
|
diff to current
2017-01-10
Merge branch 'mm/push-social-engineering-attack-doc'
blob
|
diff
|
raw
|
diff to current
2017-01-10
Merge branch 'jt/fetch-no-redundant-tag-fetch-map'
blob
|
diff
|
raw
|
diff to current
2017-01-10
Merge branch 'jc/latin-1'
blob
|
diff
|
raw
|
diff to current
2016-12-27
Merge branch 'jc/lock-report-on-error'
blob
|
diff
|
raw
|
diff to current
2016-12-27
Merge branch 'js/mingw-isatty'
blob
|
diff
|
raw
|
diff to current
2016-12-27
Merge branch 'ls/p4-lfs'
blob
|
diff
|
raw
|
diff to current
2016-12-27
Merge branch 'va/i18n-even-more'
blob
|
diff
|
raw
|
diff to current
2016-12-27
Merge branch 'lt/shortlog-by-committer'
blob
|
diff
|
raw
|
diff to current
2016-12-27
Merge branch 'mk/mingw-winansi-ttyname-termination...
blob
|
diff
|
raw
|
diff to current
2016-12-27
Merge branch 'gv/p4-multi-path-commit-fix'
blob
|
diff
|
raw
|
diff to current
2016-12-27
Merge branch 'jk/difftool-in-subdir'
blob
|
diff
|
raw
|
diff to current
2016-12-27
Merge branch 'ld/p4-compare-dir-vs-symlink'
blob
|
diff
|
raw
|
diff to current
2016-12-27
Merge branch 'ls/filter-process'
blob
|
diff
|
raw
|
diff to current
2016-12-27
Merge branch 'bw/transport-protocol-policy'
blob
|
diff
|
raw
|
diff to current
2016-12-27
Merge branch 'cp/merge-continue'
blob
|
diff
|
raw
|
diff to current
2016-12-27
Merge branch 'jc/push-default-explicit'
blob
|
diff
|
raw
2016-12-19
Merge branch 'lr/doc-fix-cet'
blob
|
diff
|
raw
2016-12-19
Merge branch 'sb/t3600-cleanup'
blob
|
diff
|
raw
2016-12-19
Merge branch 'jc/pull-rebase-ff'
blob
|
diff
|
raw
2016-12-19
Merge branch 'bb/unicode-9.0'
blob
|
diff
|
raw
2016-12-19
Merge branch 'nd/rebase-forget'
blob
|
diff
|
raw
2016-12-19
Merge branch 'sb/unpack-trees-grammofix'
blob
|
diff
|
raw
2016-12-19
Merge branch 'jc/renormalize-merge-kill-safer-crlf'
blob
|
diff
|
raw
2016-12-14
merge: add '--continue' option as a synonym for 'git...
blob
|
diff
|
raw
|
diff to current
2016-11-29
Merge branch 'tk/diffcore-delta-remove-unused' into...
blob
|
diff
|
raw
2016-11-29
Merge branch 'nd/worktree-lock' into maint
blob
|
diff
|
raw
2016-11-29
Merge branch 'ps/common-info-doc' into maint
blob
|
diff
|
raw
2016-11-29
Merge branch 'nd/test-helpers' into maint
blob
|
diff
|
raw
2016-11-29
Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into...
blob
|
diff
|
raw
2016-11-29
Merge branch 'rs/commit-pptr-simplify' into maint
blob
|
diff
|
raw
2016-11-29
Merge branch 'jk/rebase-config-insn-fmt-docfix' into...
blob
|
diff
|
raw
2016-11-29
Merge branch 'jk/daemon-path-ok-check-truncation' into...
blob
|
diff
|
raw
2016-11-29
Merge branch 'mm/send-email-cc-cruft-after-address...
blob
|
diff
|
raw
2016-11-23
Merge branch 'js/rebase-i-commentchar-fix'
blob
|
diff
|
raw
2016-11-23
Merge branch 'jc/for-each-ref-head-segfault-fix'
blob
|
diff
|
raw
2016-11-17
Merge branch 'tk/diffcore-delta-remove-unused'
blob
|
diff
|
raw
2016-11-17
Merge branch 'nd/worktree-lock'
blob
|
diff
|
raw
2016-11-11
Merge branch 'ps/common-info-doc'
blob
|
diff
|
raw
2016-10-31
Merge branch 'nd/test-helpers'
blob
|
diff
|
raw
2016-10-31
Merge branch 'sc/fmt-merge-msg-doc-markup-fix'
blob
|
diff
|
raw
2016-10-31
Merge branch 'rs/commit-pptr-simplify'
blob
|
diff
|
raw
2016-10-31
Merge branch 'jk/rebase-config-insn-fmt-docfix'
blob
|
diff
|
raw
2016-10-28
Merge branch 'rs/pretty-format-color-doc-fix' into...
blob
|
diff
|
raw
2016-10-28
Merge branch 'js/reset-usage' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'po/fix-doc-merge-base-illustration' into...
blob
|
diff
|
raw
2016-10-28
Merge branch 'jk/tap-verbose-fix' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'jk/tighten-alloc' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'jk/merge-base-fork-point-without-reflog...
blob
|
diff
|
raw
2016-10-28
Merge branch 'sb/submodule-config-doc-drop-path' into...
blob
|
diff
|
raw
2016-10-28
Merge branch 'nd/commit-p-doc' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'jk/clone-copy-alternates-fix' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'ak/curl-imap-send-explicit-scheme' into...
blob
|
diff
|
raw
2016-10-28
Merge branch 'js/regexec-buf' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'rs/c-auto-resets-attributes' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'yk/git-tag-remove-mention-of-old-layout...
blob
|
diff
|
raw
2016-10-27
Merge branch 'jk/daemon-path-ok-check-truncation'
blob
|
diff
|
raw
2016-10-27
Merge branch 'sb/submodule-ignore-trailing-slash'
blob
|
diff
|
raw
2016-10-26
Merge branch 'po/fix-doc-merge-base-illustration'
blob
|
diff
|
raw
2016-10-26
Merge branch 'jk/tap-verbose-fix'
blob
|
diff
|
raw
2016-10-26
Merge branch 'mm/send-email-cc-cruft-after-address'
blob
|
diff
|
raw
2016-10-26
Merge branch 'yk/git-tag-remove-mention-of-old-layout...
blob
|
diff
|
raw
2016-10-26
Merge branch 'jk/tighten-alloc'
blob
|
diff
|
raw
2016-10-26
Merge branch 'jk/merge-base-fork-point-without-reflog'
blob
|
diff
|
raw
2016-10-26
Merge branch 'mm/credential-libsecret'
blob
|
diff
|
raw
2016-10-26
Merge branch 'jc/ws-error-highlight'
blob
|
diff
|
raw
2016-10-20
Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
2016-10-17
Merge branch 'sb/submodule-config-doc-drop-path'
blob
|
diff
|
raw
2016-10-17
Merge branch 'rs/pretty-format-color-doc-fix'
blob
|
diff
|
raw
2016-10-17
Merge branch 'js/reset-usage'
blob
|
diff
|
raw
2016-10-17
Merge branch 'js/regexec-buf'
blob
|
diff
|
raw
2016-10-17
Merge branch 'nd/commit-p-doc'
blob
|
diff
|
raw
2016-10-17
Merge branch 'jk/clone-copy-alternates-fix'
blob
|
diff
|
raw
2016-10-11
Merge branch 'jk/verify-packfile-gently' into maint
blob
|
diff
|
raw
2016-10-11
Merge branch 'jc/verify-loose-object-header' into maint
blob
|
diff
|
raw
2016-10-11
Merge branch 'rs/git-gui-use-modern-git-merge-syntax...
blob
|
diff
|
raw
2016-10-11
Merge branch 'pb/rev-list-reverse-with-count' into...
blob
|
diff
|
raw
2016-10-11
Merge branch 'jk/graph-padding-fix' into maint
blob
|
diff
|
raw
2016-10-10
Merge branch 'jc/blame-reverse'
blob
|
diff
|
raw
2016-10-10
Merge branch 'nd/shallow-deepen'
blob
|
diff
|
raw
2016-10-10
Merge branch 'ak/curl-imap-send-explicit-scheme'
blob
|
diff
|
raw
2016-10-06
Merge branch 'rs/c-auto-resets-attributes'
blob
|
diff
|
raw
2016-10-06
Merge branch 'jk/graph-padding-fix'
blob
|
diff
|
raw
2016-10-03
Merge branch 'pb/rev-list-reverse-with-count'
blob
|
diff
|
raw
2016-10-03
Merge branch 'rs/git-gui-use-modern-git-merge-syntax'
blob
|
diff
|
raw
2016-10-03
Merge branch 'jc/verify-loose-object-header'
blob
|
diff
|
raw
2016-10-03
Merge branch 'nd/init-core-worktree-in-multi-worktree...
blob
|
diff
|
raw
2016-10-03
Merge branch 'jk/ident-ai-canonname-could-be-null'...
blob
|
diff
|
raw
next