Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/mailinfo-cleanup-fix'
[gitweb.git]
/
t
/
t6037-merge-ours-theirs.sh
2018-02-13
Merge branch 'jc/mailinfo-cleanup-fix'
blob
|
diff
|
raw
2018-02-13
Merge branch 'sg/cocci-move-array'
blob
|
diff
|
raw
2018-02-13
Merge branch 'tg/split-index-fixes'
blob
|
diff
|
raw
2018-02-13
Merge branch 'rs/strbuf-cocci-workaround'
blob
|
diff
|
raw
2018-02-13
Merge branch 'mr/packed-ref-store-fix'
blob
|
diff
|
raw
2018-02-13
Merge branch 'jt/http-redact-cookies'
blob
|
diff
|
raw
2018-02-13
Merge branch 'ds/use-get-be64'
blob
|
diff
|
raw
2018-02-13
Merge branch 'cc/sha1-file-name'
blob
|
diff
|
raw
2018-02-13
Merge branch 'nd/trace-with-env'
blob
|
diff
|
raw
2018-02-13
Merge branch 'pc/submodule-helper'
blob
|
diff
|
raw
2018-02-13
Merge branch 'rb/hashmap-h-compilation-fix'
blob
|
diff
|
raw
2018-02-13
Merge branch 'nd/diff-flush-before-warning'
blob
|
diff
|
raw
2018-02-13
Merge branch 'tb/crlf-conv-flags'
blob
|
diff
|
raw
2018-02-13
Merge branch 'rs/describe-unique-abbrev'
blob
|
diff
|
raw
2018-02-13
Merge branch 'ks/submodule-doc-updates'
blob
|
diff
|
raw
2018-02-13
Merge branch 'cl/t9001-cleanup'
blob
|
diff
|
raw
2018-02-13
Merge branch 'gs/retire-mru'
blob
|
diff
|
raw
2018-02-13
Merge branch 'ot/mru-on-list'
blob
|
diff
|
raw
2018-02-13
Merge branch 'jh/partial-clone'
blob
|
diff
|
raw
2018-02-13
Merge branch 'jh/fsck-promisors'
blob
|
diff
|
raw
2018-02-13
Merge branch 'ab/simplify-perl-makefile'
blob
|
diff
|
raw
2018-01-23
Merge branch 'nd/add-i-ignore-submodules'
blob
|
diff
|
raw
2018-01-23
Merge branch 'mm/send-email-fallback-to-local-mail...
blob
|
diff
|
raw
2018-01-23
Merge branch 'ab/doc-cat-file-e-still-shows-errors'
blob
|
diff
|
raw
2018-01-23
Merge branch 'as/read-tree-prefix-doc-fix'
blob
|
diff
|
raw
2018-01-23
Merge branch 'ys/bisect-object-id-missing-conversion...
blob
|
diff
|
raw
2018-01-23
Merge branch 'tg/stash-with-pathspec-fix'
blob
|
diff
|
raw
2018-01-23
Merge branch 'sb/submodule-update-reset-fix'
blob
|
diff
|
raw
2018-01-23
Merge branch 'bw/oidmap-autoinit'
blob
|
diff
|
raw
2018-01-23
Merge branch 'ab/commit-m-with-fixup'
blob
|
diff
|
raw
2018-01-23
Merge branch 'cc/codespeed'
blob
|
diff
|
raw
2018-01-23
Merge branch 'ab/perf-grep-threads'
blob
|
diff
|
raw
2018-01-23
Merge branch 'sb/diff-blobfind-pickaxe'
blob
|
diff
|
raw
2018-01-23
Merge branch 'jk/abort-clone-with-existing-dest'
blob
|
diff
|
raw
2018-01-23
Merge branch 'jc/merge-symlink-ours-theirs'
blob
|
diff
|
raw
2018-01-09
Merge branch 'js/misc-git-gui-stuff' of ../git-gui
blob
|
diff
|
raw
|
diff to current
2018-01-03
merge: teach -Xours/-Xtheirs to symbolic link merge
blob
|
diff
|
raw
2017-12-05
Merge branch 'ls/no-double-utf8-author-name' of .....
blob
|
diff
|
raw
|
diff to current
2017-11-22
Merge branch 'jn/reproducible-build' of ../git-gui...
blob
|
diff
|
raw
|
diff to current
2017-11-09
Merge branch 'tz/fsf-address-update' of ../git-gui...
blob
|
diff
|
raw
|
diff to current
2017-10-28
Merge branch 'sg/rev-list-doc-reorder-fix'
blob
|
diff
|
raw
|
diff to current
2017-07-25
Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
blob
|
diff
|
raw
|
diff to current
2017-04-17
Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
blob
|
diff
|
raw
|
diff to current
2017-01-18
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2016-10-20
Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'va/i18n' of ../git-gui into va/git-gui...
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'rs/use-modern-git-merge-syntax' of git...
blob
|
diff
|
raw
|
diff to current
2016-09-11
Merge branch 'js/commit-gpgsign' of ../git-gui into...
blob
|
diff
|
raw
|
diff to current
2016-09-09
Merge branch 'ls/packet-line-protocol-doc-fix' into...
blob
|
diff
|
raw
|
diff to current
2016-09-07
Merge branch 'sy/i18n' of git-gui
blob
|
diff
|
raw
|
diff to current
2016-08-31
Merge branch 'ls/packet-line-protocol-doc-fix'
blob
|
diff
|
raw
|
diff to current
2016-07-28
Merge branch 'js/t3404-grammo-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-07-13
Merge branch 'js/t3404-grammo-fix'
blob
|
diff
|
raw
|
diff to current
2016-07-11
Merge branch 'cb/t7810-test-label-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-07-06
Merge branch 'cb/t7810-test-label-fix'
blob
|
diff
|
raw
|
diff to current
2016-05-26
Merge branch 'va/mailinfo-doc-typofix' into maint
blob
|
diff
|
raw
|
diff to current
2016-05-18
Merge branch 'rn/glossary-typofix' into HEAD
blob
|
diff
|
raw
|
diff to current
2016-05-17
Merge branch 'va/mailinfo-doc-typofix'
blob
|
diff
|
raw
|
diff to current
2016-05-10
Merge branch 'rn/glossary-typofix'
blob
|
diff
|
raw
|
diff to current
2016-03-21
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2016-02-22
Merge branch 'jk/config-include'
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-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/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-08-26
Merge branch 'sg/t3020-typofix'
blob
|
diff
|
raw
|
diff to current
2015-06-16
Merge branch 'mc/commit-doc-grammofix' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'mc/commit-doc-grammofix'
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'sg/complete-decorate-full-not-long' into...
blob
|
diff
|
raw
|
diff to current
2015-05-13
Merge branch 'ep/fix-test-lib-functions-report' into...
blob
|
diff
|
raw
|
diff to current
2015-05-11
Merge branch 'sg/complete-decorate-full-not-long'
blob
|
diff
|
raw
|
diff to current
2015-05-06
Merge branch 'ep/fix-test-lib-functions-report'
blob
|
diff
|
raw
|
diff to current
2015-04-21
Merge branch 'jz/gitweb-conf-doc-fix' into maint
blob
|
diff
|
raw
|
diff to current
2015-04-19
Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
|
diff to current
2015-04-14
Merge branch 'sb/plug-streaming-leak'
blob
|
diff
|
raw
|
diff to current
2015-04-14
Merge branch 'jz/gitweb-conf-doc-fix'
blob
|
diff
|
raw
|
diff to current
2015-03-24
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-03-05
Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'tc/missing-http-proxyauth'
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
blob
|
diff
|
raw
|
diff to current
2015-02-17
Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
blob
|
diff
|
raw
|
diff to current
2015-01-12
Merge branch 'rw/apply-does-not-take-ignore-date' into...
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'sb/t5400-remove-unused'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'rw/apply-does-not-take-ignore-date'
blob
|
diff
|
raw
|
diff to current
2014-11-18
Merge branch 'jc/doc-commit-only'
blob
|
diff
|
raw
|
diff to current
2014-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-10-29
Merge branch 'bc/asciidoc-pretty-formats-fix' into...
blob
|
diff
|
raw
|
diff to current
2014-10-14
Merge branch 'bc/asciidoc-pretty-formats-fix'
blob
|
diff
|
raw
|
diff to current
2014-09-30
Merge branch 'sb/merge-recursive-copy-paste-fix'
blob
|
diff
|
raw
|
diff to current
next