Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint-2.9' into maint-2.10
[gitweb.git]
/
git-gui
/
lib
/
merge.tcl
2017-05-05
Merge branch 'maint-2.9' into maint-2.10
blob
|
diff
|
raw
2016-12-05
Merge branch 'jk/common-main' into maint-2.10
blob
|
diff
|
raw
2016-11-29
Merge branch 'tk/diffcore-delta-remove-unused' into...
blob
|
diff
|
raw
2016-11-29
Merge branch 'jk/create-branch-remove-unused-param...
blob
|
diff
|
raw
2016-11-29
Merge branch 'nd/worktree-lock' into maint
blob
|
diff
|
raw
2016-11-29
Merge branch 'ps/common-info-doc' into maint
blob
|
diff
|
raw
2016-11-29
Merge branch 'nd/test-helpers' into maint
blob
|
diff
|
raw
2016-11-29
Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into...
blob
|
diff
|
raw
2016-11-29
Merge branch 'rs/commit-pptr-simplify' into maint
blob
|
diff
|
raw
2016-11-29
Merge branch 'jk/rebase-config-insn-fmt-docfix' into...
blob
|
diff
|
raw
2016-11-29
Merge branch 'ak/pre-receive-hook-template-modefix...
blob
|
diff
|
raw
2016-11-29
Merge branch 'ls/macos-update' into maint
blob
|
diff
|
raw
2016-11-29
Merge branch 'as/merge-attr-sleep' into maint
blob
|
diff
|
raw
2016-11-29
Merge branch 'jk/daemon-path-ok-check-truncation' into...
blob
|
diff
|
raw
2016-11-29
Merge branch 'mm/send-email-cc-cruft-after-address...
blob
|
diff
|
raw
2016-11-29
Merge branch 'cp/completion-negative-refs' into maint
blob
|
diff
|
raw
2016-11-29
Merge branch 'jc/am-read-author-file' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'pb/test-parse-options-expect' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'rs/cocci' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'jc/diff-unique-abbrev-comments' into...
blob
|
diff
|
raw
2016-10-28
Merge branch 'rs/pretty-format-color-doc-fix' into...
blob
|
diff
|
raw
2016-10-28
Merge branch 'js/reset-usage' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'po/fix-doc-merge-base-illustration' into...
blob
|
diff
|
raw
2016-10-28
Merge branch 'jk/tap-verbose-fix' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'tg/add-chmod+x-fix' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'bw/submodule-branch-dot-doc' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'jk/tighten-alloc' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'jk/fetch-quick-tag-following' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'jk/merge-base-fork-point-without-reflog...
blob
|
diff
|
raw
2016-10-28
Merge branch 'sb/submodule-config-doc-drop-path' into...
blob
|
diff
|
raw
2016-10-28
Merge branch 'jk/ref-symlink-loop' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'nd/commit-p-doc' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'jk/clone-copy-alternates-fix' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'dt/http-empty-auth' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'dp/autoconf-curl-ssl' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'ak/curl-imap-send-explicit-scheme' into...
blob
|
diff
|
raw
2016-10-28
Merge branch 'jt/fetch-pack-in-vain-count-with-stateles...
blob
|
diff
|
raw
2016-10-28
Merge branch 'js/regexec-buf' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'rs/c-auto-resets-attributes' into maint
blob
|
diff
|
raw
2016-10-28
Merge branch 'yk/git-tag-remove-mention-of-old-layout...
blob
|
diff
|
raw
2016-10-17
Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com...
blob
|
diff
|
raw
2016-10-11
Merge branch 'jk/verify-packfile-gently' into maint
blob
|
diff
|
raw
2016-10-11
Merge branch 'jc/worktree-config' into maint
blob
|
diff
|
raw
2016-10-11
Merge branch 'jc/verify-loose-object-header' into maint
blob
|
diff
|
raw
2016-10-11
Merge branch 'rs/git-gui-use-modern-git-merge-syntax...
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
|
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-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
2015-12-21
Merge git://ozlabs.org/~paulus/gitk
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 'sg/t3020-typofix' into maint
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-11
Merge branch 'sg/complete-decorate-full-not-long'
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-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 '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
2014-12-22
Merge branch 'rw/apply-does-not-take-ignore-date'
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
2014-09-26
Merge branch 'sb/help-unknown-command-sort-fix'
blob
|
diff
|
raw
|
diff to current
2014-08-10
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-06-27
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-06-26
Merge early parts from git://ozlabs.org/~paulus/gitk.git
blob
|
diff
|
raw
|
diff to current
2014-06-26
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2014-05-19
Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
blob
|
diff
|
raw
|
diff to current
2014-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-01-21
Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
|
diff to current
2014-01-14
Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
blob
|
diff
|
raw
|
diff to current
2013-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2013-12-09
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-11-07
Merge branch 'vd/doc-unpack-objects' into maint
blob
|
diff
|
raw
|
diff to current
2013-11-04
Merge branch 'vd/doc-unpack-objects'
blob
|
diff
|
raw
|
diff to current
2013-10-30
Merge branch 'jk/refs-c-squelch-gcc'
blob
|
diff
|
raw
|
diff to current
2013-10-30
Merge branch 'jk/date-c-double-semicolon'
blob
|
diff
|
raw
|
diff to current
2013-10-14
Merge branch 'rj/highlight-test-hang'
blob
|
diff
|
raw
|
diff to current
2013-06-17
Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2013-05-17
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
next