Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7
[gitweb.git]
/
xdiff
/
xmerge.c
2016-03-16
Merge branch 'jk/path-name-safety-2.6' into jk/path...
blob
|
diff
|
raw
2016-03-10
Merge branch 'ma/update-hooks-sample-typofix' into...
blob
|
diff
|
raw
2016-03-10
Merge branch 'dt/initial-ref-xn-commit-doc' into maint
blob
|
diff
|
raw
2016-03-10
Merge branch 'ps/plug-xdl-merge-leak' into maint
blob
|
diff
|
raw
2016-03-10
Merge branch 'ak/git-strip-extension-from-dashed-comman...
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'ak/extract-argv0-last-dir-sep' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'jk/pack-idx-corruption-safety' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'sb/submodule-module-list-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'jk/grep-binary-workaround-in-test' into...
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'mm/push-simple-doc' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'jk/tighten-alloc' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'jk/more-comments-on-textconv' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'jk/no-diff-emit-common' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'jc/am-i-v-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'nd/git-common-dir-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'nd/dwim-wildcards-as-pathspecs' into...
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'ps/config-error' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'mg/work-tree-tests' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'sp/remote-curl-ssl-strerror' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-23
xdiff/xmerge: fix memory leak in xdl_merge
blob
|
diff
|
raw
|
diff to current
2016-02-22
Merge branch 'nd/ita-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-22
Merge branch 'pw/completion-stash' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-22
Merge branch 'mm/clean-doc-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-22
Merge branch 'dw/mergetool-vim-window-shuffle' into...
blob
|
diff
|
raw
|
diff to current
2016-02-22
Merge branch 'ah/stripspace-optstring' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-17
Merge branch 'js/test-lib-windows-emulated-yes' into...
blob
|
diff
|
raw
|
diff to current
2016-02-17
Merge branch 'aw/push-force-with-lease-reporting' into...
blob
|
diff
|
raw
|
diff to current
2016-02-17
Merge branch 'nd/do-not-move-worktree-manually' into...
blob
|
diff
|
raw
|
diff to current
2016-02-17
Merge branch 'js/xmerge-marker-eol' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-05
Merge branch 'ss/clone-depth-single-doc' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-05
Merge branch 'ew/for-each-ref-doc' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-05
Merge branch 'ss/user-manual' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-05
Merge branch 'nd/stop-setenv-work-tree' into maint
blob
|
diff
|
raw
|
diff to current
2016-01-27
merge-file: ensure that conflict sections match eol...
blob
|
diff
|
raw
|
diff to current
2016-01-27
merge-file: let conflict markers match end-of-line...
blob
|
diff
|
raw
|
diff to current
2015-12-21
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-12-01
Merge branch 'rc/configure-use-libs-when-checking-a...
blob
|
diff
|
raw
|
diff to current
2015-11-25
Merge branch 'rc/configure-use-libs-when-checking-a...
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-05
Merge branch 'jc/add-u-A-default-to-top' into maint
blob
|
diff
|
raw
|
diff to current
2015-11-04
Merge branch 'xf/user-manual-ff' into maint
blob
|
diff
|
raw
|
diff to current
2015-11-04
Merge branch 'xf/user-manual-markup' into maint
blob
|
diff
|
raw
|
diff to current
2015-11-03
Merge branch 'jk/merge-file-exit-code' into maint
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 branch 'jk/merge-file-exit-code'
blob
|
diff
|
raw
|
diff to current
2015-10-30
Merge branch 'xf/user-manual-ff'
blob
|
diff
|
raw
|
diff to current
2015-10-30
Merge branch 'jc/add-u-A-default-to-top'
blob
|
diff
|
raw
|
diff to current
2015-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-10-29
Merge branch 'xf/user-manual-markup'
blob
|
diff
|
raw
|
diff to current
2015-10-20
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
blob
|
diff
|
raw
|
diff to current
2015-10-16
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
blob
|
diff
|
raw
|
diff to current
2015-10-16
Merge branch 'jk/asciidoctor-section-heading-markup...
blob
|
diff
|
raw
|
diff to current
2015-10-16
Merge branch 'sb/http-flaky-test-fix' into maint
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-16
Merge branch 'jw/make-arflags-customizable' into maint
blob
|
diff
|
raw
|
diff to current
2015-10-15
Merge branch 'sb/http-flaky-test-fix'
blob
|
diff
|
raw
|
diff to current
2015-10-14
Merge branch 'jk/asciidoctor-section-heading-markup...
blob
|
diff
|
raw
|
diff to current
2015-10-05
Merge branch 'jw/make-arflags-customizable'
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-04
Merge branch 'jh/strbuf-read-use-read-in-full' into...
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-31
Merge branch 'sg/describe-contains'
blob
|
diff
|
raw
|
diff to current
2015-08-26
Merge branch 'sg/t3020-typofix'
blob
|
diff
|
raw
|
diff to current
2015-08-25
Merge branch 'jh/strbuf-read-use-read-in-full'
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'jc/finalize-temp-file'
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-19
Merge branch 'nd/export-worktree' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'as/sparse-checkout-removal' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-19
Merge branch 'jx/do-not-crash-receive-pack-wo-head...
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-08-03
Merge branch 'jx/do-not-crash-receive-pack-wo-head'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'as/sparse-checkout-removal'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'jc/commit-slab'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'nd/export-worktree'
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'sg/completion-commit-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-03
Merge branch 'sg/commit-cleanup-scissors' into maint
blob
|
diff
|
raw
|
diff to current
2015-07-27
Merge branch 'jk/pretty-encoding-doc' into maint
blob
|
diff
|
raw
|
diff to current
2015-07-27
Merge branch 'jk/rev-list-no-bitmap-while-pruning'...
blob
|
diff
|
raw
|
diff to current
2015-07-27
Merge branch 'jk/index-pack-reduce-recheck' into maint
blob
|
diff
|
raw
|
diff to current
2015-07-21
Merge branch 'tf/gitweb-typofix'
blob
|
diff
|
raw
|
diff to current
2015-07-17
Merge branch 'jk/still-interesting'
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 'es/osx-header-pollutes-mask-macro' into...
blob
|
diff
|
raw
|
diff to current
2015-07-15
Merge branch 'es/utf8-stupid-compiler-workaround' into...
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-15
Merge branch 'me/fetch-into-shallow-safety' into maint
blob
|
diff
|
raw
|
diff to current
2015-07-15
Merge branch 'af/tcsh-completion-noclobber' into maint
blob
|
diff
|
raw
|
diff to current
next