Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'dt/disable-bitmap-in-auto-gc'
[gitweb.git]
/
Documentation
/
merge-strategies.txt
2016-07-11
Merge branch 'ak/t7800-wo-readlink' into maint
blob
|
diff
|
raw
2016-07-11
Merge branch 'jk/tzoffset-fix' into maint
blob
|
diff
|
raw
2016-07-11
Merge branch 'lc/shell-default-value-noexpand' into...
blob
|
diff
|
raw
2016-07-11
Merge branch 'sb/clone-shallow-passthru' into maint
blob
|
diff
|
raw
2016-07-11
Merge branch 'jk/bisect-show-tree' into maint
blob
|
diff
|
raw
2016-07-11
Merge branch 'js/color-on-windows-comment'
blob
|
diff
|
raw
2016-07-11
Merge branch 'js/find-commit-subject-ignore-leading...
blob
|
diff
|
raw
2016-07-11
Merge branch 'jk/ansi-color'
blob
|
diff
|
raw
2016-07-11
Merge branch 'jc/send-email-skip-backup'
blob
|
diff
|
raw
2016-07-06
Merge branch 'ao/p4-has-branch-prefix-fix'
blob
|
diff
|
raw
2016-07-06
Merge branch 'cb/t7810-test-label-fix'
blob
|
diff
|
raw
2016-07-06
Merge branch 'sb/t5614-modernize'
blob
|
diff
|
raw
2016-07-06
Merge branch 'ak/t7800-wo-readlink'
blob
|
diff
|
raw
2016-07-06
Merge branch 'jk/tzoffset-fix'
blob
|
diff
|
raw
2016-07-06
Merge branch 'lc/shell-default-value-noexpand'
blob
|
diff
|
raw
2016-07-06
Merge branch 'sb/clone-shallow-passthru'
blob
|
diff
|
raw
2016-07-06
Merge branch 'jk/bisect-show-tree'
blob
|
diff
|
raw
2016-07-06
Merge branch 'jc/deref-tag' into maint
blob
|
diff
|
raw
2016-07-06
Merge branch 'pb/strbuf-read-file-doc' into maint
blob
|
diff
|
raw
2016-07-06
Merge branch 'jk/fetch-prune-doc' into maint
blob
|
diff
|
raw
2016-07-06
Merge branch 'mg/cherry-pick-multi-on-unborn' into...
blob
|
diff
|
raw
2016-07-06
Merge branch 'em/newer-freebsd-shells-are-fine-with...
blob
|
diff
|
raw
2016-07-06
Merge branch 'nb/gnome-keyring-build' into maint
blob
|
diff
|
raw
2016-07-06
Merge branch 'jk/avoid-unbounded-alloca' into maint
blob
|
diff
|
raw
2016-07-06
Merge branch 'vs/prompt-avoid-unset-variable' into...
blob
|
diff
|
raw
2016-07-06
Merge branch 'dn/gpg-doc' into maint
blob
|
diff
|
raw
2016-07-06
Merge branch 'ap/git-svn-propset-doc' into maint
blob
|
diff
|
raw
2016-06-27
Merge branch 'mg/cherry-pick-multi-on-unborn'
blob
|
diff
|
raw
2016-06-27
Merge branch 'em/newer-freebsd-shells-are-fine-with...
blob
|
diff
|
raw
2016-06-27
Merge branch 'nb/gnome-keyring-build'
blob
|
diff
|
raw
2016-06-27
Merge branch 'jc/deref-tag'
blob
|
diff
|
raw
2016-06-27
Merge branch 'jk/avoid-unbounded-alloca'
blob
|
diff
|
raw
2016-06-27
Merge branch 'vs/prompt-avoid-unset-variable'
blob
|
diff
|
raw
2016-06-27
Merge branch 'pb/strbuf-read-file-doc'
blob
|
diff
|
raw
2016-06-27
Merge branch 'dn/gpg-doc'
blob
|
diff
|
raw
2016-06-27
Merge branch 'jk/fetch-prune-doc'
blob
|
diff
|
raw
2016-06-27
Merge branch 'ap/git-svn-propset-doc'
blob
|
diff
|
raw
2016-06-27
Merge branch 'jk/rev-list-count-with-bitmap' into maint
blob
|
diff
|
raw
2016-06-20
Merge branch 'jk/rev-list-count-with-bitmap'
blob
|
diff
|
raw
2016-06-13
Merge branch 'jk/parseopt-string-list' into jk/string...
blob
|
diff
|
raw
2016-06-10
Merge branch 'jk/diff-compact-heuristic'
blob
|
diff
|
raw
2016-06-06
Merge branch 'ar/diff-args-osx-precompose' into maint
blob
|
diff
|
raw
2016-06-03
Merge branch 'rs/apply-name-terminate'
blob
|
diff
|
raw
2016-06-03
Merge branch 'rs/patch-id-use-skip-prefix'
blob
|
diff
|
raw
2016-06-03
Merge branch 'pa/cherry-pick-doc-typo'
blob
|
diff
|
raw
2016-06-03
Merge branch 'js/rebase-i-dedup-call-to-rerere'
blob
|
diff
|
raw
2016-05-31
Merge branch 'bn/http-cookiefile-config' into maint
blob
|
diff
|
raw
2016-05-31
Merge branch 'jk/test-send-sh-x-trace-elsewhere' into...
blob
|
diff
|
raw
2016-05-31
Merge branch 'js/name-rev-use-oldest-ref' into maint
blob
|
diff
|
raw
2016-05-31
Merge branch 'jk/cat-file-buffered-batch-all'
blob
|
diff
|
raw
2016-05-30
Merge branch 'ak/t0008-ksh88-workaround'
blob
|
diff
|
raw
2016-05-30
Merge branch 'rj/log-decorate-auto'
blob
|
diff
|
raw
2016-05-26
Merge branch 'jc/fsck-nul-in-commit' into maint
blob
|
diff
|
raw
2016-05-26
Merge branch 'sb/z-is-gnutar-ism' into maint
blob
|
diff
|
raw
2016-05-26
Merge branch 'bn/config-doc-tt-varnames' into maint
blob
|
diff
|
raw
2016-05-26
Merge branch 'nd/remote-plural-ours-plus-theirs' into...
blob
|
diff
|
raw
2016-05-26
Merge branch 'ak/t4151-ls-files-could-be-empty' into...
blob
|
diff
|
raw
2016-05-26
Merge branch 'jc/test-seq' into maint
blob
|
diff
|
raw
2016-05-26
Merge branch 'tb/t5601-sed-fix' into maint
blob
|
diff
|
raw
2016-05-26
Merge branch 'va/mailinfo-doc-typofix' into maint
blob
|
diff
|
raw
2016-05-26
Merge branch 'maint-2.7' into maint
blob
|
diff
|
raw
2016-05-23
Merge branch 'jc/rerere-multi'
blob
|
diff
|
raw
2016-05-23
Merge branch 'ar/diff-args-osx-precompose'
blob
|
diff
|
raw
2016-05-23
Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'
blob
|
diff
|
raw
2016-05-18
Merge branch 'jk/push-client-deadlock-fix'
blob
|
diff
|
raw
2016-05-18
Merge branch 'sb/misc-cleanups' into HEAD
blob
|
diff
|
raw
2016-05-18
Merge branch 'sb/clean-test-fix' into HEAD
blob
|
diff
|
raw
2016-05-18
Merge branch 'rn/glossary-typofix' into HEAD
blob
|
diff
|
raw
2016-05-18
Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD
blob
|
diff
|
raw
2016-05-18
Merge branch 'sk/gitweb-highlight-encoding' into HEAD
blob
|
diff
|
raw
2016-05-18
Merge branch 'ls/travis-submitting-patches' into HEAD
blob
|
diff
|
raw
2016-05-18
Merge branch 'js/close-packs-before-gc' into HEAD
blob
|
diff
|
raw
2016-05-18
Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD
blob
|
diff
|
raw
2016-05-18
Merge branch 'nf/mergetool-prompt' into HEAD
blob
|
diff
|
raw
2016-05-18
Merge branch 'jd/send-email-to-whom' into HEAD
blob
|
diff
|
raw
2016-05-18
Merge branch 'jk/push-client-deadlock-fix' into HEAD
blob
|
diff
|
raw
2016-05-18
Merge branch 'sb/mv-submodule-fix' into HEAD
blob
|
diff
|
raw
2016-05-18
Merge branch 'da/user-useconfigonly' into HEAD
blob
|
diff
|
raw
2016-05-17
Merge branch 'va/mailinfo-doc-typofix'
blob
|
diff
|
raw
2016-05-17
Merge branch 'jk/test-send-sh-x-trace-elsewhere'
blob
|
diff
|
raw
2016-05-17
Merge branch 'jc/fsck-nul-in-commit'
blob
|
diff
|
raw
2016-05-17
Merge branch 'jc/ll-merge-internal'
blob
|
diff
|
raw
2016-05-17
Merge branch 'tb/t5601-sed-fix'
blob
|
diff
|
raw
2016-05-17
Merge branch 'jc/test-seq'
blob
|
diff
|
raw
2016-05-17
Merge branch 'ak/t4151-ls-files-could-be-empty'
blob
|
diff
|
raw
2016-05-17
Merge branch 'jk/submodule-c-credential'
blob
|
diff
|
raw
2016-05-17
Merge branch 'nd/remote-plural-ours-plus-theirs'
blob
|
diff
|
raw
2016-05-17
Merge branch 'bn/config-doc-tt-varnames'
blob
|
diff
|
raw
2016-05-17
Merge branch 'sb/z-is-gnutar-ism'
blob
|
diff
|
raw
2016-05-17
Merge branch 'jc/config-pathname-type'
blob
|
diff
|
raw
2016-05-17
Merge branch 'bn/http-cookiefile-config'
blob
|
diff
|
raw
2016-05-13
Merge branch 'sb/submodule-module-list-pathspec-fix'
blob
|
diff
|
raw
2016-05-13
Merge branch 'jc/commit-tree-ignore-commit-gpgsign'
blob
|
diff
|
raw
2016-05-10
Merge branch 'sk/gitweb-highlight-encoding'
blob
|
diff
|
raw
2016-05-10
Merge branch 'sb/clean-test-fix'
blob
|
diff
|
raw
2016-05-10
Merge branch 'rn/glossary-typofix'
blob
|
diff
|
raw
2016-05-10
Merge branch 'ls/travis-submitting-patches'
blob
|
diff
|
raw
2016-05-10
Merge branch 'js/close-packs-before-gc'
blob
|
diff
|
raw
2016-05-10
Merge branch 'sb/misc-cleanups'
blob
|
diff
|
raw
2016-05-10
Merge branch 'jk/submodule-c-credential' into js/http...
blob
|
diff
|
raw
next