Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Sync with maint
[gitweb.git]
/
Documentation
/
merge-strategies.txt
2013-09-04
Merge branch 'tr/fd-gotcha-fixes'
blob
|
diff
|
raw
2013-09-04
Merge branch 'jc/check-x-z'
blob
|
diff
|
raw
2013-08-05
Merge branch 'dn/test-reject-utf-16'
blob
|
diff
|
raw
2013-07-31
Merge branch 'rj/commit-slab-fix'
blob
|
diff
|
raw
2013-07-31
Merge branch 'jk/commit-how-to-abort-cherry-pick'
blob
|
diff
|
raw
2013-07-31
Merge branch 'ds/doc-two-kinds-of-tags'
blob
|
diff
|
raw
2013-07-30
Merge branch 'jk/capabilities-doc'
blob
|
diff
|
raw
2013-07-25
Merge branch 'tr/line-log'
blob
|
diff
|
raw
2013-07-22
Merge branch 'mk/upload-pack-off-by-one-dead-code-removal'
blob
|
diff
|
raw
2013-07-22
Merge branch 'jk/t0008-sigpipe-fix'
blob
|
diff
|
raw
2013-07-22
Merge branch 'db/show-ref-head'
blob
|
diff
|
raw
2013-07-22
Merge branch 'tr/protect-low-3-fds'
blob
|
diff
|
raw
2013-07-22
Merge branch 'sb/parse-object-buffer-eaten'
blob
|
diff
|
raw
2013-07-22
Merge branch 'dw/request-pull-diag'
blob
|
diff
|
raw
2013-07-22
Merge branch 'tr/fd-gotcha-fixes'
blob
|
diff
|
raw
2013-07-22
Merge branch 'rr/maint-fetch-tag-doc-asterisks' into...
blob
|
diff
|
raw
2013-07-22
Merge branch 'dk/maint-t5150-dirname' into maint
blob
|
diff
|
raw
2013-07-22
Merge branch 'dk/version-gen-gitdir' into maint
blob
|
diff
|
raw
2013-07-22
Merge branch 'nk/config-local-doc' into maint
blob
|
diff
|
raw
2013-07-22
Merge branch 'kb/diff-blob-blob-doc' into maint
blob
|
diff
|
raw
2013-07-22
Merge branch 'mm/merge-in-dirty-worktree-doc' into...
blob
|
diff
|
raw
2013-07-22
Merge branch 'ph/builtin-srcs-are-in-subdir-these-days...
blob
|
diff
|
raw
2013-07-22
Merge branch 'mh/maint-lockfile-overflow' into maint
blob
|
diff
|
raw
2013-07-22
Merge branch 'jc/maint-diff-core-safecrlf' into maint
blob
|
diff
|
raw
2013-07-19
Merge branch 'rr/name-rev-stdin-doc' into maint
blob
|
diff
|
raw
2013-07-19
Merge branch 'ft/diff-rename-default-score-is-half...
blob
|
diff
|
raw
2013-07-19
Merge branch 'jc/t1512-fix' into maint
blob
|
diff
|
raw
2013-07-19
Merge branch 'mm/push-force-is-dangerous' into maint
blob
|
diff
|
raw
2013-07-19
Merge branch 'tr/test-commit-only-on-orphan' into maint
blob
|
diff
|
raw
2013-07-18
Merge branch 'es/overlapping-range-set'
blob
|
diff
|
raw
2013-07-15
Merge branch 'tr/maint-apply-non-git-patch-parsefix...
blob
|
diff
|
raw
2013-07-15
Merge branch 'bc/http-keep-memory-given-to-curl' into...
blob
|
diff
|
raw
2013-07-12
Merge branch 'rs/pickaxe-simplify'
blob
|
diff
|
raw
2013-07-12
Merge branch 'rr/name-rev-stdin-doc'
blob
|
diff
|
raw
2013-07-12
Merge branch 'ft/diff-rename-default-score-is-half'
blob
|
diff
|
raw
2013-07-12
Merge branch 'nd/warn-ambiguous-object-name' into jk...
blob
|
diff
|
raw
2013-07-11
Merge branch 'jc/t1512-fix'
blob
|
diff
|
raw
2013-07-11
Merge branch 'jc/maint-diff-core-safecrlf'
blob
|
diff
|
raw
2013-07-11
Merge branch 'mh/maint-lockfile-overflow'
blob
|
diff
|
raw
2013-07-03
Merge branch 'cr/git-work-tree-sans-git-dir' into maint
blob
|
diff
|
raw
2013-07-03
Merge branch 'fc/do-not-use-the-index-in-add-to-index...
blob
|
diff
|
raw
2013-07-03
Merge branch 'jc/core-checkstat' into maint
blob
|
diff
|
raw
2013-07-03
Merge branch 'cb/log-follow-with-combined' into maint
blob
|
diff
|
raw
2013-07-03
Merge branch 'maint-1.8.1' into maint-1.8.2
blob
|
diff
|
raw
2013-07-01
Merge branch 'jc/topo-author-date-sort'
blob
|
diff
|
raw
2013-07-01
Merge branch 'jk/commit-info-slab'
blob
|
diff
|
raw
2013-06-30
Merge branch 'fc/macos-x-clipped-write' into maint
blob
|
diff
|
raw
2013-06-27
Merge branch 'mk/combine-diff-context-horizon-fix'...
blob
|
diff
|
raw
2013-06-27
Merge branch 'bc/http-keep-memory-given-to-curl'
blob
|
diff
|
raw
2013-06-26
Merge branch 'tr/maint-apply-non-git-patch-parsefix'
blob
|
diff
|
raw
2013-06-26
Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'
blob
|
diff
|
raw
2013-06-26
Merge branch 'mm/merge-in-dirty-worktree-doc'
blob
|
diff
|
raw
2013-06-26
Merge branch 'kb/diff-blob-blob-doc'
blob
|
diff
|
raw
2013-06-26
Merge branch 'mm/push-force-is-dangerous'
blob
|
diff
|
raw
2013-06-24
Merge branch 'nk/config-local-doc'
blob
|
diff
|
raw
2013-06-24
Merge branch 'dk/version-gen-gitdir'
blob
|
diff
|
raw
2013-06-24
Merge branch 'dk/maint-t5150-dirname'
blob
|
diff
|
raw
2013-06-17
Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
2013-06-11
Merge branch 'rr/maint-fetch-tag-doc-asterisks'
blob
|
diff
|
raw
2013-06-11
Merge branch 'jk/test-exit-code-by-signal'
blob
|
diff
|
raw
2013-06-11
Merge branch 'nd/warn-ambiguous-object-name'
blob
|
diff
|
raw
2013-06-11
Merge branch 'cr/git-work-tree-sans-git-dir'
blob
|
diff
|
raw
2013-06-11
Merge branch 'cb/log-follow-with-combined'
blob
|
diff
|
raw
2013-06-11
Merge branch 'fc/do-not-use-the-index-in-add-to-index'
blob
|
diff
|
raw
2013-06-11
Merge branch 'tr/test-commit-only-on-orphan'
blob
|
diff
|
raw
2013-06-10
Merge branch 'jn/config-ignore-inaccessible' into maint
blob
|
diff
|
raw
2013-06-10
Merge branch 'kb/status-ignored-optim-2' into maint
blob
|
diff
|
raw
2013-06-07
Merge branch 'js/transport-helper-error-reporting-fix...
blob
|
diff
|
raw
2013-06-05
Merge branch 'jc/core-checkstat'
blob
|
diff
|
raw
2013-06-03
Merge branch 'kb/status-ignored-optim-2'
blob
|
diff
|
raw
2013-06-02
Merge branch 'tr/line-log'
blob
|
diff
|
raw
2013-06-02
Merge branch 'mk/combine-diff-context-horizon-fix'
blob
|
diff
|
raw
2013-06-02
Merge branch 'fc/macos-x-clipped-write'
blob
|
diff
|
raw
2013-06-02
Merge branch 'nd/clone-local-with-colon'
blob
|
diff
|
raw
2013-05-29
Merge branch 'jn/config-ignore-inaccessible'
blob
|
diff
|
raw
2013-05-29
Merge branch 'jk/lookup-object-prefer-latest'
blob
|
diff
|
raw
2013-05-29
Merge branch 'mh/packed-refs-various'
blob
|
diff
|
raw
2013-05-29
Merge branch 'as/check-ignore'
blob
|
diff
|
raw
2013-05-29
Merge branch 'jc/prune-all'
blob
|
diff
|
raw
2013-05-29
Merge branch 'js/transport-helper-error-reporting-fix'
blob
|
diff
|
raw
2013-05-29
Merge branch 'fc/transport-helper-error-reporting'
blob
|
diff
|
raw
2013-05-17
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2013-05-13
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2013-05-09
Merge branch 'mv/sequencer-pick-error-diag'
blob
|
diff
|
raw
2013-05-09
Merge branch 'tr/copy-revisions-from-stdin' into maint
blob
|
diff
|
raw
2013-05-07
Merge branch 'jk/merge-tree-added-identically'
blob
|
diff
|
raw
2013-05-03
Merge branch 'tr/unpack-entry-use-after-free-fix'
blob
|
diff
|
raw
2013-05-03
Merge branch 'tr/remote-tighten-commandline-parsing...
blob
|
diff
|
raw
2013-05-03
Merge branch 'jn/glossary-revision' into maint
blob
|
diff
|
raw
2013-05-01
Merge branch 'hb/git-pm-tempfile'
blob
|
diff
|
raw
2013-05-01
Merge branch 'rs/pp-user-info-without-extra-allocation'
blob
|
diff
|
raw
2013-05-01
Merge branch 'tr/remote-tighten-commandline-parsing'
blob
|
diff
|
raw
2013-05-01
Merge branch 'zk/prompt-rebase-step'
blob
|
diff
|
raw
2013-04-28
Merge branch 'jk/check-corrupt-objects-carefully'
blob
|
diff
|
raw
2013-04-28
Merge branch 'jk/merge-tree-added-identically'
blob
|
diff
|
raw
2013-04-26
Merge branch 'rr/shortlog-doc'
blob
|
diff
|
raw
2013-04-26
Merge branch 'ph/rebase-original'
blob
|
diff
|
raw
2013-04-26
Merge branch 'jn/glossary-revision'
blob
|
diff
|
raw
2013-04-26
Merge branch 'fc/remote-bzr'
blob
|
diff
|
raw
2013-04-26
Merge branch 'jk/a-thread-only-dies-once' into maint
blob
|
diff
|
raw
next