Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'da/user-useconfigonly' into HEAD
[gitweb.git]
/
Documentation
/
merge-strategies.txt
2016-05-18
Merge branch 'da/user-useconfigonly' into HEAD
blob
|
diff
|
raw
2016-05-06
Merge branch 'ky/imap-send-openssl-1.1.0' into maint
blob
|
diff
|
raw
2016-05-06
Merge branch 'js/replace-edit-use-editor-configuration...
blob
|
diff
|
raw
2016-05-06
Merge branch 'kn/for-each-tag-branch' into maint
blob
|
diff
|
raw
2016-05-02
Merge branch 'jc/xstrfmt-null-with-prec-0' into maint
blob
|
diff
|
raw
2016-05-02
Merge branch 'ew/send-email-drop-data-dumper' into...
blob
|
diff
|
raw
2016-05-02
Merge branch 'ad/cygwin-wants-rename' into maint
blob
|
diff
|
raw
2016-05-02
Merge branch 'jc/http-socks5h' into maint
blob
|
diff
|
raw
2016-05-02
Merge branch 'ad/commit-have-m-option' into maint
blob
|
diff
|
raw
2016-05-02
Merge branch 'sb/submodule-helper-clone-regression...
blob
|
diff
|
raw
2016-05-02
Merge branch 'jk/branch-shortening-funny-symrefs' into...
blob
|
diff
|
raw
2016-05-02
Merge branch 'es/format-patch-doc-hide-no-patch' into...
blob
|
diff
|
raw
2016-05-02
Merge branch 'ky/branch-d-worktree' into maint
blob
|
diff
|
raw
2016-05-02
Merge branch 'ew/send-email-readable-message-id' into...
blob
|
diff
|
raw
2016-04-29
Merge branch 'ep/trace-doc-sample-fix' into maint
blob
|
diff
|
raw
2016-04-29
Merge branch 'jc/makefile-redirection-stderr' into...
blob
|
diff
|
raw
2016-04-29
Merge branch 'ak/use-hashmap-iter-first-in-submodule...
blob
|
diff
|
raw
2016-04-29
Merge branch 'tb/blame-force-read-cache-to-workaround...
blob
|
diff
|
raw
2016-04-29
Merge branch 'sk/send-pack-all-fix' into maint
blob
|
diff
|
raw
2016-04-29
Merge branch 'sg/diff-multiple-identical-renames' into...
blob
|
diff
|
raw
2016-04-15
Merge branch 'jv/merge-nothing-into-void' into maint
blob
|
diff
|
raw
2016-04-15
Merge branch 'ss/commit-squash-msg' into maint
blob
|
diff
|
raw
2016-04-15
Merge branch 'jk/send-email-rtrim-mailrc-alias' into...
blob
|
diff
|
raw
2016-04-15
Merge branch 'da/mergetool-delete-delete-conflict'...
blob
|
diff
|
raw
2016-04-15
Merge branch 'jk/getwholeline-getdelim-empty' into...
blob
|
diff
|
raw
2016-04-15
Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codep...
blob
|
diff
|
raw
2016-04-15
Merge branch 'jk/rev-parse-local-env-vars' into maint
blob
|
diff
|
raw
2016-04-15
Merge branch 'jk/config-get-urlmatch' into maint
blob
|
diff
|
raw
2016-04-15
Merge branch 'pb/t7502-drop-dup' into maint
blob
|
diff
|
raw
2016-04-15
Merge branch 'jk/test-httpd-config-nosystem' into maint
blob
|
diff
|
raw
2016-04-15
Merge branch 'sb/clone-t57-t56' into maint
blob
|
diff
|
raw
2016-04-15
Merge branch 'jk/credential-cache-comment-exit' into...
blob
|
diff
|
raw
2016-04-15
Merge branch 'ss/exc-flag-is-a-collection-of-bits'...
blob
|
diff
|
raw
2016-04-15
Merge branch 'mp/upload-pack-use-embedded-args' into...
blob
|
diff
|
raw
2016-04-15
Merge branch 'oa/doc-diff-check' into maint
blob
|
diff
|
raw
2016-04-15
Merge branch 'pb/opt-cmdmode-doc' into maint
blob
|
diff
|
raw
2016-04-15
Merge branch 'nd/apply-doc' into maint
blob
|
diff
|
raw
2016-04-03
Merge branch 'mm/readme-markdown' into maint
blob
|
diff
|
raw
2016-03-24
Merge branch 'ls/p4-doc-markup'
blob
|
diff
|
raw
2016-03-24
Merge branch 'sb/submodule-module-list-pathspec-fix'
blob
|
diff
|
raw
2016-03-21
Sync with maint
blob
|
diff
|
raw
2016-03-21
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2016-03-17
Sync with Git 2.7.4
blob
|
diff
|
raw
2016-03-16
Sync with maint
blob
|
diff
|
raw
2016-03-16
Merge branch 'jc/sane-grep'
blob
|
diff
|
raw
2016-03-16
Merge branch 'cn/deprecate-ssh-git-url'
blob
|
diff
|
raw
2016-03-14
Merge branch 'mg/wt-status-mismarked-i18n'
blob
|
diff
|
raw
2016-03-10
Sync with 2.7.3
blob
|
diff
|
raw
2016-03-10
Merge branch 'jx/http-no-proxy'
blob
|
diff
|
raw
2016-03-10
Merge branch 'jc/exclusion-doc'
blob
|
diff
|
raw
2016-03-10
Merge branch 'js/close-packs-before-gc'
blob
|
diff
|
raw
2016-03-10
Merge branch 'sb/rebase-summary'
blob
|
diff
|
raw
2016-03-04
Merge branch 'nd/clear-gitenv-upon-use-of-alias'
blob
|
diff
|
raw
2016-03-04
Merge branch 'js/pthread-exit-emu-windows'
blob
|
diff
|
raw
2016-03-04
Merge branch 'sb/submodule-parallel-fetch'
blob
|
diff
|
raw
2016-03-04
Merge branch 'jk/tighten-alloc'
blob
|
diff
|
raw
2016-03-04
Merge branch 'jk/pack-idx-corruption-safety'
blob
|
diff
|
raw
2016-03-04
Merge branch 'mg/httpd-tests-update-for-apache-2.4'
blob
|
diff
|
raw
2016-03-04
Merge branch 'js/mingw-tests'
blob
|
diff
|
raw
2016-03-03
Merge branch 'jc/maint-index-pack-keep' into jc/index...
blob
|
diff
|
raw
2016-02-26
Merge branch 'mm/readme-markdown'
blob
|
diff
|
raw
2016-02-26
Merge branch 'ma/update-hooks-sample-typofix'
blob
|
diff
|
raw
2016-02-26
Merge branch 'ls/makefile-cflags-developer-tweak'
blob
|
diff
|
raw
2016-02-26
Merge branch 'dt/initial-ref-xn-commit-doc'
blob
|
diff
|
raw
2016-02-26
Merge branch 'js/config-set-in-non-repository'
blob
|
diff
|
raw
2016-02-26
Merge branch 'jk/epipe-in-async'
blob
|
diff
|
raw
2016-02-26
Merge branch 'mm/push-default-warning'
blob
|
diff
|
raw
2016-02-26
Merge branch 'fa/merge-recursive-no-rename'
blob
|
diff
|
raw
2016-02-22
Merge branch 'jk/config-include'
blob
|
diff
|
raw
|
diff to current
2016-02-22
merge-strategies.txt: fix typo
blob
|
diff
|
raw
2016-02-17
merge-recursive: more consistent interface
blob
|
diff
|
raw
|
diff to current
2016-02-17
merge-recursive: option to disable renames
blob
|
diff
|
raw
|
diff to current
2015-12-21
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-11-05
Merge branch 'jk/initialization-fix-to-add-submodule...
blob
|
diff
|
raw
|
diff to current
2015-11-03
Merge branch 'jk/initialization-fix-to-add-submodule...
blob
|
diff
|
raw
|
diff to current
2015-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-10-16
Merge branch 'jk/make-findstring-makeflags-fix' into...
blob
|
diff
|
raw
|
diff to current
2015-10-05
Merge branch 'jk/make-findstring-makeflags-fix'
blob
|
diff
|
raw
|
diff to current
2015-09-17
Merge branch 'as/config-doc-markup-fix'
blob
|
diff
|
raw
|
diff to current
2015-09-17
Merge branch 'br/svn-doc-include-paths-config' into...
blob
|
diff
|
raw
|
diff to current
2015-09-17
Merge branch 'ah/submodule-typofix-in-error' into maint
blob
|
diff
|
raw
|
diff to current
2015-09-14
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-09-14
Merge branch 'mp/t7060-diff-index-test'
blob
|
diff
|
raw
|
diff to current
2015-09-14
Merge branch 'gb/apply-comment-typofix'
blob
|
diff
|
raw
|
diff to current
2015-09-04
Merge branch 'ee/clean-test-fixes' into maint
blob
|
diff
|
raw
|
diff to current
2015-09-04
Merge branch 'sg/t3020-typofix' into maint
blob
|
diff
|
raw
|
diff to current
2015-09-02
Merge branch 'ee/clean-test-fixes'
blob
|
diff
|
raw
|
diff to current
2015-09-01
Merge branch 'ah/submodule-typofix-in-error'
blob
|
diff
|
raw
|
diff to current
2015-09-01
Merge branch 'ah/reflog-typofix-in-error'
blob
|
diff
|
raw
|
diff to current
2015-09-01
Merge branch 'ah/read-tree-usage-string'
blob
|
diff
|
raw
|
diff to current
2015-09-01
Merge branch 'ah/pack-objects-usage-strings'
blob
|
diff
|
raw
|
diff to current
2015-09-01
Merge branch 'br/svn-doc-include-paths-config'
blob
|
diff
|
raw
|
diff to current
2015-08-26
Merge branch 'sg/t3020-typofix'
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'sb/remove-unused-var-from-builtin-add...
blob
|
diff
|
raw
|
diff to current
2015-08-12
Merge branch 'sb/remove-unused-var-from-builtin-add'
blob
|
diff
|
raw
|
diff to current
2015-07-15
Merge branch 'jc/prompt-document-ps1-state-separator...
blob
|
diff
|
raw
|
diff to current
2015-07-15
Merge branch 'fk/doc-format-patch-vn' into maint
blob
|
diff
|
raw
|
diff to current
2015-07-01
Merge branch 'jc/prompt-document-ps1-state-separator'
blob
|
diff
|
raw
|
diff to current
2015-06-24
Merge branch 'fk/doc-format-patch-vn'
blob
|
diff
|
raw
|
diff to current
2015-06-16
Merge branch 'mc/commit-doc-grammofix' into maint
blob
|
diff
|
raw
|
diff to current
next