projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'nd/exclusion-regression-fix'
[git]
/
xdiff
/
xmerge.c
2016-02-24
Junio C Hamano
Merge branch 'ce/https-public-key-pinning'
blob
|
commitdiff
|
raw
2016-02-24
Junio C Hamano
Merge branch 'bc/http-empty-auth'
blob
|
commitdiff
|
raw
2016-02-24
Junio C Hamano
Merge branch 'sp/remote-curl-ssl-strerror'
blob
|
commitdiff
|
raw
2016-02-24
Junio C Hamano
Merge branch 'ew/force-ipv4'
blob
|
commitdiff
|
raw
2016-02-24
Junio C Hamano
Merge branch 'nd/git-common-dir-fix'
blob
|
commitdiff
|
raw
2016-02-24
Junio C Hamano
Merge branch 'nd/dwim-wildcards-as-pathspecs'
blob
|
commitdiff
|
raw
2016-02-22
Junio C Hamano
Merge branch 'js/git-remote-add-url-insteadof-test'
blob
|
commitdiff
|
raw
2016-02-22
Junio C Hamano
Merge branch 'jk/config-include'
blob
|
commitdiff
|
raw
2016-02-22
Junio C Hamano
Merge branch 'ew/connect-verbose'
blob
|
commitdiff
|
raw
2016-02-22
Junio C Hamano
Merge branch 'nd/ita-cleanup' into maint
blob
|
commitdiff
|
raw
2016-02-22
Junio C Hamano
Merge branch 'pw/completion-stash' into maint
blob
|
commitdiff
|
raw
2016-02-22
Junio C Hamano
Merge branch 'mm/clean-doc-fix' into maint
blob
|
commitdiff
|
raw
2016-02-22
Junio C Hamano
Merge branch 'dw/mergetool-vim-window-shuffle' into...
blob
|
commitdiff
|
raw
2016-02-22
Junio C Hamano
Merge branch 'ah/stripspace-optstring' into maint
blob
|
commitdiff
|
raw
2016-02-22
Junio C Hamano
Merge branch 'pw/completion-stash'
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'dw/mergetool-vim-window-shuffle'
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'ah/stripspace-optstring'
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'mm/clean-doc-fix'
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'jk/rerere-xsnprintf'
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'jk/test-path-utils-xsnprintf'
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'da/user-useconfigonly'
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'nd/clear-gitenv-upon-use-of-alias'
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'mg/mingw-test-fix'
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'js/mingw-tests'
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'jk/drop-rsync-transport'
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'js/test-lib-windows-emulated-yes' into...
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'aw/push-force-with-lease-reporting' into...
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'nd/do-not-move-worktree-manually' into...
blob
|
commitdiff
|
raw
2016-02-17
Junio C Hamano
Merge branch 'js/xmerge-marker-eol' into maint
blob
|
commitdiff
|
raw
2016-02-10
Junio C Hamano
Merge branch 'js/test-lib-windows-emulated-yes'
blob
|
commitdiff
|
raw
2016-02-10
Junio C Hamano
Merge branch 'wp/sha1-name-negative-match'
blob
|
commitdiff
|
raw
2016-02-10
Junio C Hamano
Merge branch 'jk/options-cleanup'
blob
|
commitdiff
|
raw
2016-02-10
Junio C Hamano
Merge branch 'aw/push-force-with-lease-reporting'
blob
|
commitdiff
|
raw
2016-02-10
Junio C Hamano
Merge branch 'ls/clean-smudge-override-in-config'
blob
|
commitdiff
|
raw
2016-02-10
Junio C Hamano
Merge branch 'ew/connect-verbose'
blob
|
commitdiff
|
raw
2016-02-10
Junio C Hamano
Merge branch 'cc/untracked'
blob
|
commitdiff
|
raw
2016-02-10
Junio C Hamano
Merge branch 'js/xmerge-marker-eol'
blob
|
commitdiff
|
raw
2016-02-05
Junio C Hamano
Merge branch 'ss/clone-depth-single-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-02-05
Junio C Hamano
Merge branch 'ew/for-each-ref-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-02-05
Junio C Hamano
Merge branch 'ss/user-manual' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-02-05
Junio C Hamano
Merge branch 'nd/stop-setenv-work-tree' into maint
blob
|
commitdiff
|
raw
|
diff to current
2016-01-27
Johannes Schindelin
merge-file: ensure that conflict sections match eol...
blob
|
commitdiff
|
raw
2016-01-27
Johannes Schindelin
merge-file: let conflict markers match end-of-line...
blob
|
commitdiff
|
raw
|
diff to current
2016-01-20
Junio C Hamano
Merge branch 'ss/clone-depth-single-doc'
blob
|
commitdiff
|
raw
|
diff to current
2016-01-20
Junio C Hamano
Merge branch 'ew/for-each-ref-doc'
blob
|
commitdiff
|
raw
|
diff to current
2016-01-20
Junio C Hamano
Merge branch 'ss/user-manual'
blob
|
commitdiff
|
raw
|
diff to current
2016-01-20
Junio C Hamano
Merge branch 'jk/pack-revindex'
blob
|
commitdiff
|
raw
|
diff to current
2016-01-12
Junio C Hamano
Merge branch 'nd/stop-setenv-work-tree'
blob
|
commitdiff
|
raw
|
diff to current
2015-12-22
Junio C Hamano
Merge branch 'nd/stop-setenv-work-tree' into nd/clear...
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-12-01
Jeff King
Merge branch 'rc/configure-use-libs-when-checking-a...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-25
Jeff King
Merge branch 'rc/configure-use-libs-when-checking-a...
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-05
Junio C Hamano
Merge branch 'jc/add-u-A-default-to-top' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-11-04
Junio C Hamano
Merge branch 'xf/user-manual-ff' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-11-04
Junio C Hamano
Merge branch 'xf/user-manual-markup' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-11-03
Junio C Hamano
Merge branch 'jk/merge-file-exit-code' into maint
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 branch 'jk/merge-file-exit-code'
blob
|
commitdiff
|
raw
|
diff to current
2015-10-30
Junio C Hamano
Merge branch 'xf/user-manual-ff'
blob
|
commitdiff
|
raw
|
diff to current
2015-10-30
Junio C Hamano
Merge branch 'jc/add-u-A-default-to-top'
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-29
Junio C Hamano
Merge branch 'xf/user-manual-markup'
blob
|
commitdiff
|
raw
|
diff to current
2015-10-20
Junio C Hamano
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-16
Junio C Hamano
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-16
Junio C Hamano
Merge branch 'jk/asciidoctor-section-heading-markup...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-16
Junio C Hamano
Merge branch 'sb/http-flaky-test-fix' into maint
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-16
Junio C Hamano
Merge branch 'jw/make-arflags-customizable' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-10-15
Junio C Hamano
Merge branch 'sb/http-flaky-test-fix'
blob
|
commitdiff
|
raw
|
diff to current
2015-10-14
Junio C Hamano
Merge branch 'jk/asciidoctor-section-heading-markup...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-05
Junio C Hamano
Merge branch 'jw/make-arflags-customizable'
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-04
Junio C Hamano
Merge branch 'jh/strbuf-read-use-read-in-full' into...
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-31
Junio C Hamano
Merge branch 'sg/describe-contains'
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-25
Junio C Hamano
Merge branch 'jh/strbuf-read-use-read-in-full'
blob
|
commitdiff
|
raw
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'jc/finalize-temp-file'
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-19
Junio C Hamano
Merge branch 'nd/export-worktree' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'as/sparse-checkout-removal' into maint
blob
|
commitdiff
|
raw
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'jx/do-not-crash-receive-pack-wo-head...
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-08-03
Junio C Hamano
Merge branch 'jx/do-not-crash-receive-pack-wo-head'
blob
|
commitdiff
|
raw
|
diff to current
2015-08-03
Junio C Hamano
Merge branch 'as/sparse-checkout-removal'
blob
|
commitdiff
|
raw
|
diff to current
2015-08-03
Junio C Hamano
Merge branch 'jc/commit-slab'
blob
|
commitdiff
|
raw
|
diff to current
next