Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/ref-filter-colors-fix' into maint
[gitweb.git]
/
Documentation
/
merge-strategies.txt
2017-10-18
Merge branch 'jk/ref-filter-colors-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'jc/doc-checkout' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'tb/complete-describe' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'rs/rs-mailmap' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'rs/fsck-null-return-from-lookup' into...
blob
|
diff
|
raw
2017-10-18
Merge branch 'jk/sha1-loose-object-info-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'sb/branch-avoid-repeated-strbuf-release...
blob
|
diff
|
raw
2017-10-18
Merge branch 'rs/qsort-s' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'jn/strbuf-doc-re-reuse' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'rs/run-command-use-alloc-array' into...
blob
|
diff
|
raw
2017-10-18
Merge branch 'rs/tag-null-pointer-arith-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'rs/cocci-de-paren-call-params' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'ad/doc-markup-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'mr/doc-negative-pathspec' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'jk/validate-headref-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'ks/doc-use-camelcase-for-config-name...
blob
|
diff
|
raw
2017-10-18
Merge branch 'jk/doc-read-tree-table-asciidoctor-fix...
blob
|
diff
|
raw
2017-10-18
Merge branch 'hn/typofix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'ks/test-readme-phrasofix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'ez/doc-duplicated-words-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'kd/doc-for-each-ref' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'cc/subprocess-handshake-missing-capabilit...
blob
|
diff
|
raw
2017-10-18
Merge branch 'jk/system-path-cleanup' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'bb/doc-eol-dirty' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'mg/timestamp-t-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'ma/pkt-line-leakfix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'jk/config-lockfile-leak-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'dw/diff-highlight-makefile-fix' into...
blob
|
diff
|
raw
2017-10-18
Merge branch 'jk/drop-sha1-entry-pos' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'tb/ref-filter-empty-modifier' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'rb/compat-poll-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'tg/memfixes' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'ar/request-pull-phrasofix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'jc/merge-x-theirs-docfix' into maint
blob
|
diff
|
raw
2017-09-25
merge-strategies: avoid implying that "-s theirs" exists
blob
|
diff
|
raw
2017-07-30
Merge tag 'v2.7.6' into maint-2.8
blob
|
diff
|
raw
|
diff to current
2017-07-25
Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
blob
|
diff
|
raw
|
diff to current
2017-06-24
Merge branch 'jc/diff-tree-stale-comment' into maint
blob
|
diff
|
raw
|
diff to current
2017-06-24
Merge branch 'jk/pack-idx-corruption-safety' into maint
blob
|
diff
|
raw
|
diff to current
2017-06-13
Merge branch 'jk/pack-idx-corruption-safety'
blob
|
diff
|
raw
|
diff to current
2017-06-13
Merge branch 'jc/diff-tree-stale-comment'
blob
|
diff
|
raw
|
diff to current
2017-06-05
Merge branch 'sg/core-filemode-doc-typofix' into maint
blob
|
diff
|
raw
|
diff to current
2017-05-29
Merge branch 'sg/core-filemode-doc-typofix'
blob
|
diff
|
raw
|
diff to current
2017-05-05
Merge branch 'maint-2.7' into maint-2.8
blob
|
diff
|
raw
|
diff to current
2017-05-01
Merge branch 'jk/prio-queue-avoid-swap-with-self'
blob
|
diff
|
raw
|
diff to current
2017-04-17
Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
blob
|
diff
|
raw
|
diff to current
2017-04-17
Merge branch 'jc/unused-symbols'
blob
|
diff
|
raw
|
diff to current
2017-04-11
Merge branch 'cc/untracked'
blob
|
diff
|
raw
|
diff to current
2017-03-30
Merge branch 'bc/push-cert-receive-fix'
blob
|
diff
|
raw
|
diff to current
2017-03-30
Merge branch 'jc/merge-drop-old-syntax'
blob
|
diff
|
raw
|
diff to current
2017-03-28
Merge branch 'rs/path-name-safety-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2017-03-24
Merge branch 'rs/path-name-safety-cleanup'
blob
|
diff
|
raw
|
diff to current
2017-03-21
Merge branch 'jk/ewah-use-right-type-in-sizeof' into...
blob
|
diff
|
raw
|
diff to current
2017-03-13
Merge branch 'jk/ewah-use-right-type-in-sizeof'
blob
|
diff
|
raw
|
diff to current
2017-02-24
Merge branch 'bc/worktree-doc-fix-detached'
blob
|
diff
|
raw
|
diff to current
2017-02-16
Merge branch 'ls/p4-path-encoding'
blob
|
diff
|
raw
|
diff to current
2017-02-10
Merge branch 'ps/worktree-prune-help-fix'
blob
|
diff
|
raw
|
diff to current
2017-01-31
Merge branch 'ad/bisect-terms' into maint
blob
|
diff
|
raw
|
diff to current
2017-01-23
Merge branch 'ad/bisect-terms'
blob
|
diff
|
raw
|
diff to current
2017-01-18
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2017-01-17
Merge branch 'sb/t3600-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2017-01-17
Merge branch 'jc/pull-rebase-ff' into maint
blob
|
diff
|
raw
|
diff to current
2017-01-17
Merge branch 'bb/unicode-9.0' into maint
blob
|
diff
|
raw
|
diff to current
2016-12-19
Merge branch 'sb/t3600-cleanup'
blob
|
diff
|
raw
|
diff to current
2016-12-19
Merge branch 'jc/pull-rebase-ff'
blob
|
diff
|
raw
|
diff to current
2016-12-19
Merge branch 'bb/unicode-9.0'
blob
|
diff
|
raw
|
diff to current
2016-11-29
Merge branch 'mm/send-email-cc-cruft-after-address...
blob
|
diff
|
raw
|
diff to current
2016-10-28
Merge branch 'jk/tighten-alloc' into maint
blob
|
diff
|
raw
|
diff to current
2016-10-26
Merge branch 'mm/send-email-cc-cruft-after-address'
blob
|
diff
|
raw
|
diff to current
2016-10-26
Merge branch 'jk/tighten-alloc'
blob
|
diff
|
raw
|
diff to current
2016-10-26
Merge branch 'jc/ws-error-highlight'
blob
|
diff
|
raw
|
diff to current
2016-10-20
Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2016-10-11
Merge branch 'jc/verify-loose-object-header' into maint
blob
|
diff
|
raw
|
diff to current
2016-10-10
Merge branch 'nd/shallow-deepen'
blob
|
diff
|
raw
|
diff to current
2016-10-03
Merge branch 'jc/verify-loose-object-header'
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'ls/travis-homebrew-path-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'ep/doc-check-ref-format-example' into...
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'jk/reduce-gc-aggressive-depth' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'ew/http-do-not-forget-to-call-curl-multi...
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'mr/vcs-svn-printf-ulong' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'ls/travis-homebrew-path-fix'
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'ep/doc-check-ref-format-example'
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'va/i18n' of ../git-gui into va/git-gui...
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'rs/use-modern-git-merge-syntax' of git...
blob
|
diff
|
raw
|
diff to current
2016-09-21
Merge branch 'jk/reduce-gc-aggressive-depth'
blob
|
diff
|
raw
|
diff to current
2016-09-21
Merge branch 'mr/vcs-svn-printf-ulong'
blob
|
diff
|
raw
|
diff to current
2016-09-21
Merge branch 'ew/http-do-not-forget-to-call-curl-multi...
blob
|
diff
|
raw
|
diff to current
2016-09-19
Merge branch 'po/range-doc' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-11
Merge branch 'js/commit-gpgsign' of ../git-gui into...
blob
|
diff
|
raw
|
diff to current
2016-09-09
Merge branch 'po/range-doc'
blob
|
diff
|
raw
|
diff to current
2016-09-09
Merge branch 'rs/mailinfo-lib' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-09
Merge branch 'jk/tighten-alloc' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-09
Merge branch 'ls/packet-line-protocol-doc-fix' into...
blob
|
diff
|
raw
|
diff to current
2016-09-09
Merge branch 'js/import-tars-hardlinks' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-09
Merge branch 'jk/push-force-with-lease-creation' into...
blob
|
diff
|
raw
|
diff to current
2016-09-07
Merge branch 'sy/i18n' of git-gui
blob
|
diff
|
raw
|
diff to current
2016-08-31
Merge branch 'ls/packet-line-protocol-doc-fix'
blob
|
diff
|
raw
|
diff to current
2016-08-17
Merge branch 'rs/mailinfo-lib'
blob
|
diff
|
raw
|
diff to current
2016-08-17
Merge branch 'jk/tighten-alloc'
blob
|
diff
|
raw
|
diff to current
2016-08-12
Merge branch 'js/import-tars-hardlinks'
blob
|
diff
|
raw
|
diff to current
next