projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Sync with maint
[git]
/
Documentation
/
merge-options.txt
2016-05-06
Junio C Hamano
Sync with maint
blob
|
commitdiff
|
raw
2016-05-06
Junio C Hamano
Merge branch 'jk/diff-compact-heuristic'
blob
|
commitdiff
|
raw
2016-05-06
Junio C Hamano
Merge branch 'ls/p4-lfs-test-fix-2.7.0'
blob
|
commitdiff
|
raw
2016-05-06
Junio C Hamano
Merge branch 'bc/object-id'
blob
|
commitdiff
|
raw
2016-05-06
Junio C Hamano
Merge branch 'bw/rebase-merge-entire-branch'
blob
|
commitdiff
|
raw
2016-05-06
Junio C Hamano
Merge branch 'jc/drop-git-spec-in'
blob
|
commitdiff
|
raw
2016-05-06
Junio C Hamano
Merge branch 'js/http-custom-headers'
blob
|
commitdiff
|
raw
2016-05-06
Junio C Hamano
Merge branch 'sb/clone-shallow-passthru'
blob
|
commitdiff
|
raw
2016-05-06
Junio C Hamano
Merge branch 'ld/p4-test-py3'
blob
|
commitdiff
|
raw
2016-05-06
Junio C Hamano
Merge branch 'sb/config-exit-status-list'
blob
|
commitdiff
|
raw
2016-05-03
Junio C Hamano
Sync with maint
blob
|
commitdiff
|
raw
2016-05-03
Junio C Hamano
Merge branch 'nf/mergetool-prompt'
blob
|
commitdiff
|
raw
2016-05-03
Junio C Hamano
Merge branch 'jd/send-email-to-whom'
blob
|
commitdiff
|
raw
2016-05-03
Junio C Hamano
Merge branch 'rt/string-list-lookup-cleanup'
blob
|
commitdiff
|
raw
2016-05-03
Junio C Hamano
Merge branch 'jk/fix-attribute-macro-in-2.5'
blob
|
commitdiff
|
raw
2016-05-03
Junio C Hamano
Merge branch 'sg/test-lib-simplify-expr-away'
blob
|
commitdiff
|
raw
2016-05-03
Junio C Hamano
Merge branch 'nd/remove-unused'
blob
|
commitdiff
|
raw
2016-05-03
Junio C Hamano
Merge branch 'js/name-rev-use-oldest-ref'
blob
|
commitdiff
|
raw
2016-05-03
Junio C Hamano
Merge branch 'jd/p4-jobs-in-commit'
blob
|
commitdiff
|
raw
2016-05-03
Junio C Hamano
Merge branch 'en/merge-fixes'
blob
|
commitdiff
|
raw
2016-05-02
Junio C Hamano
Sync with maint
blob
|
commitdiff
|
raw
2016-04-29
Junio C Hamano
Sync with 2.8.2
blob
|
commitdiff
|
raw
2016-04-29
Junio C Hamano
Merge branch 'st/verify-tag'
blob
|
commitdiff
|
raw
2016-04-29
Junio C Hamano
Merge branch 'js/win32-mmap'
blob
|
commitdiff
|
raw
2016-04-29
Junio C Hamano
Merge branch 'jc/merge-refuse-new-root'
blob
|
commitdiff
|
raw
2016-04-21
Junio C Hamano
pull: pass --allow-unrelated-histories to "git merge"
blob
|
commitdiff
|
raw
2016-03-21
Junio C Hamano
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
commitdiff
|
raw
|
diff to current
2016-03-14
Junio C Hamano
Merge branch 'mg/wt-status-mismarked-i18n'
blob
|
commitdiff
|
raw
|
diff to current
2016-02-22
Junio C Hamano
Merge branch 'jk/config-include'
blob
|
commitdiff
|
raw
|
diff to current
2015-12-21
Junio C Hamano
Merge git://ozlabs.org/~paulus/gitk
blob
|
commitdiff
|
raw
|
diff to current
2015-11-05
Junio C Hamano
Merge branch 'jk/initialization-fix-to-add-submodule...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-03
Junio C Hamano
Merge branch 'jk/initialization-fix-to-add-submodule...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-30
Junio C Hamano
Merge git://ozlabs.org/~paulus/gitk
blob
|
commitdiff
|
raw
|
diff to current
2015-10-16
Junio C Hamano
Merge branch 'jk/make-findstring-makeflags-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-05
Junio C Hamano
Merge branch 'jk/make-findstring-makeflags-fix'
blob
|
commitdiff
|
raw
|
diff to current
2015-09-17
Junio C Hamano
Merge branch 'as/config-doc-markup-fix'
blob
|
commitdiff
|
raw
|
diff to current
2015-09-17
Junio C Hamano
Merge branch 'br/svn-doc-include-paths-config' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-09-17
Junio C Hamano
Merge branch 'ah/submodule-typofix-in-error' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-09-14
Junio C Hamano
Merge git://ozlabs.org/~paulus/gitk
blob
|
commitdiff
|
raw
|
diff to current
2015-09-14
Junio C Hamano
Merge branch 'mp/t7060-diff-index-test'
blob
|
commitdiff
|
raw
|
diff to current
2015-09-14
Junio C Hamano
Merge branch 'gb/apply-comment-typofix'
blob
|
commitdiff
|
raw
|
diff to current
2015-09-04
Junio C Hamano
Merge branch 'ee/clean-test-fixes' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-09-04
Junio C Hamano
Merge branch 'sg/t3020-typofix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-09-02
Junio C Hamano
Merge branch 'ee/clean-test-fixes'
blob
|
commitdiff
|
raw
|
diff to current
2015-09-01
Junio C Hamano
Merge branch 'ah/submodule-typofix-in-error'
blob
|
commitdiff
|
raw
|
diff to current
2015-09-01
Junio C Hamano
Merge branch 'ah/reflog-typofix-in-error'
blob
|
commitdiff
|
raw
|
diff to current
2015-09-01
Junio C Hamano
Merge branch 'ah/read-tree-usage-string'
blob
|
commitdiff
|
raw
|
diff to current
2015-09-01
Junio C Hamano
Merge branch 'ah/pack-objects-usage-strings'
blob
|
commitdiff
|
raw
|
diff to current
2015-09-01
Junio C Hamano
Merge branch 'br/svn-doc-include-paths-config'
blob
|
commitdiff
|
raw
|
diff to current
2015-08-26
Junio C Hamano
Merge branch 'sg/t3020-typofix'
blob
|
commitdiff
|
raw
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'sb/remove-unused-var-from-builtin-add...
blob
|
commitdiff
|
raw
|
diff to current
2015-08-12
Junio C Hamano
Merge branch 'sb/remove-unused-var-from-builtin-add'
blob
|
commitdiff
|
raw
|
diff to current
2015-07-15
Junio C Hamano
Merge branch 'jc/prompt-document-ps1-state-separator...
blob
|
commitdiff
|
raw
|
diff to current
2015-07-15
Junio C Hamano
Merge branch 'fk/doc-format-patch-vn' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-07-01
Junio C Hamano
Merge branch 'jc/prompt-document-ps1-state-separator'
blob
|
commitdiff
|
raw
|
diff to current
2015-06-24
Junio C Hamano
Merge branch 'fk/doc-format-patch-vn'
blob
|
commitdiff
|
raw
|
diff to current
2015-06-16
Junio C Hamano
Merge branch 'mc/commit-doc-grammofix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-06-05
Junio C Hamano
Merge branch 'jc/gitignore-precedence' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-06-01
Junio C Hamano
Merge branch 'mc/commit-doc-grammofix'
blob
|
commitdiff
|
raw
|
diff to current
2015-05-26
Junio C Hamano
Merge branch 'sg/complete-decorate-full-not-long' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-05-19
Junio C Hamano
Merge branch 'jc/gitignore-precedence'
blob
|
commitdiff
|
raw
|
diff to current
2015-05-13
Junio C Hamano
Merge branch 'ep/fix-test-lib-functions-report' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-05-11
Junio C Hamano
Merge branch 'sg/complete-decorate-full-not-long'
blob
|
commitdiff
|
raw
|
diff to current
2015-05-06
Junio C Hamano
Merge branch 'ep/fix-test-lib-functions-report'
blob
|
commitdiff
|
raw
|
diff to current
2015-04-28
Junio C Hamano
Merge branch 'mg/show-notes-doc'
blob
|
commitdiff
|
raw
|
diff to current
2015-04-21
Junio C Hamano
Merge branch 'jz/gitweb-conf-doc-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-04-21
Junio C Hamano
Merge branch 'iu/fix-parse-options-h-comment' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-19
Junio C Hamano
Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2015-04-14
Junio C Hamano
Merge branch 'sb/plug-streaming-leak'
blob
|
commitdiff
|
raw
|
diff to current
2015-04-14
Junio C Hamano
Merge branch 'jz/gitweb-conf-doc-fix'
blob
|
commitdiff
|
raw
|
diff to current
2015-04-14
Junio C Hamano
Merge branch 'iu/fix-parse-options-h-comment'
blob
|
commitdiff
|
raw
|
diff to current
2015-03-24
Junio C Hamano
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
commitdiff
|
raw
|
diff to current
2015-03-23
Junio C Hamano
Merge branch 'jc/decorate-leaky-separator-color' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-03-20
Junio C Hamano
Merge branch 'jc/decorate-leaky-separator-color'
blob
|
commitdiff
|
raw
|
diff to current
2015-03-14
Junio C Hamano
Merge branch 'jc/diff-test-updates' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-03-14
Junio C Hamano
Merge branch 'jc/apply-beyond-symlink' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-03-10
Junio C Hamano
Merge branch 'jc/decorate-leaky-separator-color' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-03-05
Junio C Hamano
Merge branch 'es/blame-commit-info-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-03-05
Junio C Hamano
Merge branch 'ab/merge-file-prefix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-03-05
Junio C Hamano
Merge branch 'ps/submodule-sanitize-path-upon-add'...
blob
|
commitdiff
|
raw
|
diff to current
2015-03-05
Junio C Hamano
Merge branch 'jk/pack-bitmap' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-03-05
Junio C Hamano
Merge branch 'jk/decimal-width-for-uintmax' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-03-05
Junio C Hamano
Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
blob
|
commitdiff
|
raw
|
diff to current
2015-03-05
Junio C Hamano
Merge branch 'jc/diff-test-updates'
blob
|
commitdiff
|
raw
|
diff to current
2015-03-03
Junio C Hamano
Merge branch 'jc/apply-beyond-symlink'
blob
|
commitdiff
|
raw
|
diff to current
2015-02-25
Junio C Hamano
Merge branch 'jc/send-email-sensible-encoding'
blob
|
commitdiff
|
raw
|
diff to current
2015-02-25
Junio C Hamano
Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-25
Junio C Hamano
Merge branch 'jc/max-io-size-and-ssize-max'
blob
|
commitdiff
|
raw
|
diff to current
2015-02-25
Junio C Hamano
Merge branch 'tc/missing-http-proxyauth'
blob
|
commitdiff
|
raw
|
diff to current
2015-02-25
Junio C Hamano
Merge branch 'jc/diff-format-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-02-25
Junio C Hamano
Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-25
Junio C Hamano
Merge branch 'jk/status-read-branch-name-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-22
Junio C Hamano
Merge branch 'ps/submodule-sanitize-path-upon-add'
blob
|
commitdiff
|
raw
|
diff to current
2015-02-22
Junio C Hamano
Merge branch 'ab/merge-file-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2015-02-22
Junio C Hamano
Merge branch 'es/blame-commit-info-fix'
blob
|
commitdiff
|
raw
|
diff to current
2015-02-18
Junio C Hamano
Merge branch 'jk/decimal-width-for-uintmax'
blob
|
commitdiff
|
raw
|
diff to current
2015-02-18
Junio C Hamano
Merge branch 'jk/pack-bitmap'
blob
|
commitdiff
|
raw
|
diff to current
2015-02-17
Junio C Hamano
Merge branch 'jk/status-read-branch-name-fix'
blob
|
commitdiff
|
raw
|
diff to current
2015-02-17
Junio C Hamano
Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-17
Junio C Hamano
Merge branch 'jc/diff-format-doc'
blob
|
commitdiff
|
raw
|
diff to current
next
projects / git / history
Junio C Hamano