Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
t6036: add a failed conflict detection case with submodule add/add
[gitweb.git]
/
t
/
t9151
/
make-svnmerge-dump
2018-03-06
Merge branch 'cb/ttk-style' of git-gui into cb/git...
blob
|
diff
|
raw
2018-03-02
Merge branch 'bb/ssh-key-files' of git-gui into bb...
blob
|
diff
|
raw
2018-03-02
Merge branch 'bp/bind-kp-enter' of git-gui into bp...
blob
|
diff
|
raw
2018-01-09
Merge branch 'js/misc-git-gui-stuff' of ../git-gui
blob
|
diff
|
raw
2017-12-05
Merge branch 'ls/no-double-utf8-author-name' of .....
blob
|
diff
|
raw
2017-11-22
Merge branch 'jn/reproducible-build' of ../git-gui...
blob
|
diff
|
raw
2017-11-09
Merge branch 'tz/fsf-address-update' of ../git-gui...
blob
|
diff
|
raw
2017-10-28
Merge branch 'sg/rev-list-doc-reorder-fix'
blob
|
diff
|
raw
2017-07-25
Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
blob
|
diff
|
raw
2017-04-17
Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
blob
|
diff
|
raw
2017-01-18
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2016-10-20
Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
2016-09-26
Merge branch 'va/i18n' of ../git-gui into va/git-gui...
blob
|
diff
|
raw
2016-09-26
Merge branch 'rs/use-modern-git-merge-syntax' of git...
blob
|
diff
|
raw
2016-09-11
Merge branch 'js/commit-gpgsign' of ../git-gui into...
blob
|
diff
|
raw
2016-09-09
Merge branch 'ls/packet-line-protocol-doc-fix' into...
blob
|
diff
|
raw
2016-09-07
Merge branch 'sy/i18n' of git-gui
blob
|
diff
|
raw
2016-08-31
Merge branch 'ls/packet-line-protocol-doc-fix'
blob
|
diff
|
raw
2016-08-03
Merge branch 'jk/git-jump'
blob
|
diff
|
raw
2016-07-28
Merge branch 'js/t3404-grammo-fix' into maint
blob
|
diff
|
raw
2016-07-13
Merge branch 'js/t3404-grammo-fix'
blob
|
diff
|
raw
2016-07-11
Merge branch 'cb/t7810-test-label-fix' into maint
blob
|
diff
|
raw
2016-07-06
Merge branch 'cb/t7810-test-label-fix'
blob
|
diff
|
raw
2016-05-26
Merge branch 'va/mailinfo-doc-typofix' into maint
blob
|
diff
|
raw
2016-05-18
Merge branch 'rn/glossary-typofix' into HEAD
blob
|
diff
|
raw
2016-05-17
Merge branch 'va/mailinfo-doc-typofix'
blob
|
diff
|
raw
2016-05-10
Merge branch 'rn/glossary-typofix'
blob
|
diff
|
raw
2016-03-21
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2016-03-14
Merge branch 'mg/wt-status-mismarked-i18n'
blob
|
diff
|
raw
2016-02-22
Merge branch 'jk/config-include'
blob
|
diff
|
raw
2015-12-21
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2015-11-05
Merge branch 'jk/initialization-fix-to-add-submodule...
blob
|
diff
|
raw
2015-11-03
Merge branch 'jk/initialization-fix-to-add-submodule...
blob
|
diff
|
raw
2015-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2015-10-16
Merge branch 'jk/make-findstring-makeflags-fix' into...
blob
|
diff
|
raw
2015-10-05
Merge branch 'jk/make-findstring-makeflags-fix'
blob
|
diff
|
raw
2015-09-17
Merge branch 'as/config-doc-markup-fix'
blob
|
diff
|
raw
2015-09-17
Merge branch 'br/svn-doc-include-paths-config' into...
blob
|
diff
|
raw
2015-09-17
Merge branch 'ah/submodule-typofix-in-error' into maint
blob
|
diff
|
raw
2015-09-14
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2015-09-14
Merge branch 'mp/t7060-diff-index-test'
blob
|
diff
|
raw
2015-09-14
Merge branch 'gb/apply-comment-typofix'
blob
|
diff
|
raw
2015-09-04
Merge branch 'ee/clean-test-fixes' into maint
blob
|
diff
|
raw
2015-09-04
Merge branch 'sg/t3020-typofix' into maint
blob
|
diff
|
raw
2015-09-02
Merge branch 'ee/clean-test-fixes'
blob
|
diff
|
raw
2015-09-01
Merge branch 'ah/submodule-typofix-in-error'
blob
|
diff
|
raw
2015-09-01
Merge branch 'ah/reflog-typofix-in-error'
blob
|
diff
|
raw
2015-09-01
Merge branch 'ah/read-tree-usage-string'
blob
|
diff
|
raw
2015-09-01
Merge branch 'ah/pack-objects-usage-strings'
blob
|
diff
|
raw
2015-09-01
Merge branch 'br/svn-doc-include-paths-config'
blob
|
diff
|
raw
2015-08-26
Merge branch 'sg/t3020-typofix'
blob
|
diff
|
raw
2015-07-15
Merge branch 'jc/prompt-document-ps1-state-separator...
blob
|
diff
|
raw
2015-07-15
Merge branch 'fk/doc-format-patch-vn' into maint
blob
|
diff
|
raw
2015-07-01
Merge branch 'jc/prompt-document-ps1-state-separator'
blob
|
diff
|
raw
2015-06-24
Merge branch 'fk/doc-format-patch-vn'
blob
|
diff
|
raw
2015-06-16
Merge branch 'mc/commit-doc-grammofix' into maint
blob
|
diff
|
raw
2015-06-05
Merge branch 'jc/gitignore-precedence' into maint
blob
|
diff
|
raw
2015-06-01
Merge branch 'mc/commit-doc-grammofix'
blob
|
diff
|
raw
2015-05-26
Merge branch 'sg/complete-decorate-full-not-long' into...
blob
|
diff
|
raw
2015-05-19
Merge branch 'jc/gitignore-precedence'
blob
|
diff
|
raw
2015-05-13
Merge branch 'ep/fix-test-lib-functions-report' into...
blob
|
diff
|
raw
2015-05-11
Merge branch 'sg/complete-decorate-full-not-long'
blob
|
diff
|
raw
2015-05-06
Merge branch 'ep/fix-test-lib-functions-report'
blob
|
diff
|
raw
2015-04-28
Merge branch 'mg/show-notes-doc'
blob
|
diff
|
raw
2015-04-21
Merge branch 'jz/gitweb-conf-doc-fix' into maint
blob
|
diff
|
raw
2015-04-19
Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
2015-04-14
Merge branch 'sb/plug-streaming-leak'
blob
|
diff
|
raw
2015-04-14
Merge branch 'jz/gitweb-conf-doc-fix'
blob
|
diff
|
raw
2015-03-24
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2015-03-23
Merge branch 'jc/decorate-leaky-separator-color' into...
blob
|
diff
|
raw
2015-03-20
Merge branch 'jc/decorate-leaky-separator-color'
blob
|
diff
|
raw
2015-03-14
Merge branch 'jc/diff-test-updates' into maint
blob
|
diff
|
raw
2015-03-14
Merge branch 'jc/apply-beyond-symlink' into maint
blob
|
diff
|
raw
2015-03-10
Merge branch 'jc/decorate-leaky-separator-color' into...
blob
|
diff
|
raw
2015-03-05
Merge branch 'es/blame-commit-info-fix' into maint
blob
|
diff
|
raw
2015-03-05
Merge branch 'ab/merge-file-prefix' into maint
blob
|
diff
|
raw
2015-03-05
Merge branch 'ps/submodule-sanitize-path-upon-add'...
blob
|
diff
|
raw
2015-03-05
Merge branch 'jk/pack-bitmap' into maint
blob
|
diff
|
raw
2015-03-05
Merge branch 'jk/decimal-width-for-uintmax' into maint
blob
|
diff
|
raw
2015-03-05
Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
blob
|
diff
|
raw
2015-03-05
Merge branch 'jc/diff-test-updates'
blob
|
diff
|
raw
2015-03-03
Merge branch 'jc/apply-beyond-symlink'
blob
|
diff
|
raw
2015-02-25
Merge branch 'jc/send-email-sensible-encoding'
blob
|
diff
|
raw
2015-02-25
Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
blob
|
diff
|
raw
2015-02-25
Merge branch 'jc/max-io-size-and-ssize-max'
blob
|
diff
|
raw
2015-02-25
Merge branch 'tc/missing-http-proxyauth'
blob
|
diff
|
raw
2015-02-25
Merge branch 'jc/diff-format-doc' into maint
blob
|
diff
|
raw
2015-02-25
Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
blob
|
diff
|
raw
2015-02-25
Merge branch 'jk/status-read-branch-name-fix' into...
blob
|
diff
|
raw
2015-02-22
Merge branch 'ps/submodule-sanitize-path-upon-add'
blob
|
diff
|
raw
2015-02-22
Merge branch 'ab/merge-file-prefix'
blob
|
diff
|
raw
2015-02-22
Merge branch 'es/blame-commit-info-fix'
blob
|
diff
|
raw
2015-02-18
Merge branch 'jk/decimal-width-for-uintmax'
blob
|
diff
|
raw
2015-02-18
Merge branch 'jk/pack-bitmap'
blob
|
diff
|
raw
2015-02-17
Merge branch 'jk/status-read-branch-name-fix'
blob
|
diff
|
raw
2015-02-17
Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
blob
|
diff
|
raw
2015-02-17
Merge branch 'jc/diff-format-doc'
blob
|
diff
|
raw
2015-01-12
Merge branch 'mh/find-uniq-abbrev' into maint
blob
|
diff
|
raw
2015-01-12
Merge branch 'rw/apply-does-not-take-ignore-date' into...
blob
|
diff
|
raw
2015-01-12
Merge branch 'jk/for-each-reflog-ent-reverse' into...
blob
|
diff
|
raw
next