Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
git-mailinfo: add --message-id
[gitweb.git]
/
Documentation
/
howto
/
using-merge-subtree.txt
2014-11-18
Merge branch 'jc/doc-commit-only'
blob
|
diff
|
raw
2014-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-10-29
Merge branch 'bc/asciidoc-pretty-formats-fix' into...
blob
|
diff
|
raw
2014-10-14
Merge branch 'bc/asciidoc-pretty-formats-fix'
blob
|
diff
|
raw
2014-09-30
Merge branch 'sb/merge-recursive-copy-paste-fix'
blob
|
diff
|
raw
2014-09-26
Merge branch 'sb/help-unknown-command-sort-fix'
blob
|
diff
|
raw
2014-08-10
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-06-27
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-06-26
Merge early parts from git://ozlabs.org/~paulus/gitk.git
blob
|
diff
|
raw
2014-06-26
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2014-05-19
Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
blob
|
diff
|
raw
2014-02-27
Merge branch 'bs/stdio-undef-before-redef'
blob
|
diff
|
raw
2014-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-01-21
Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
2014-01-14
Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
blob
|
diff
|
raw
2013-12-17
Merge branch 'jk/two-way-merge-corner-case-fix' into...
blob
|
diff
|
raw
2013-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2013-12-09
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2013-12-05
Merge branch 'jk/two-way-merge-corner-case-fix'
blob
|
diff
|
raw
2013-11-07
Merge branch 'vd/doc-unpack-objects' into maint
blob
|
diff
|
raw
2013-11-04
Merge branch 'vd/doc-unpack-objects'
blob
|
diff
|
raw
2013-10-30
Merge branch 'jk/refs-c-squelch-gcc'
blob
|
diff
|
raw
2013-10-30
Merge branch 'jk/date-c-double-semicolon'
blob
|
diff
|
raw
2013-10-30
Merge branch 'sg/t3600-nul-sha1-fix'
blob
|
diff
|
raw
2013-10-28
Merge branch 'ew/keepalive'
blob
|
diff
|
raw
2013-10-14
Merge branch 'rj/highlight-test-hang'
blob
|
diff
|
raw
2013-10-14
Merge branch 'nv/doc-config-signingkey'
blob
|
diff
|
raw
2013-08-05
Merge branch 'dn/test-reject-utf-16'
blob
|
diff
|
raw
2013-07-19
Merge branch 'jc/t1512-fix' into maint
blob
|
diff
|
raw
2013-07-11
Merge branch 'jc/t1512-fix'
blob
|
diff
|
raw
2013-06-17
Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
2013-05-17
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2013-05-13
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2013-04-03
Merge branch 'jk/checkout-attribute-lookup' into maint...
blob
|
diff
|
raw
2013-04-03
Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
blob
|
diff
|
raw
2013-04-03
Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
blob
|
diff
|
raw
2013-04-01
Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
blob
|
diff
|
raw
2013-03-28
Merge branch 'jc/remove-treesame-parent-in-simplify...
blob
|
diff
|
raw
2013-03-28
Merge branch 'jk/checkout-attribute-lookup'
blob
|
diff
|
raw
2013-03-26
Merge branch 'ob/imap-send-ssl-verify' into maint
blob
|
diff
|
raw
2013-03-25
Merge branch 'ap/maint-diff-rename-avoid-overlap'
blob
|
diff
|
raw
2013-03-21
Merge branch 'ob/imap-send-ssl-verify'
blob
|
diff
|
raw
2013-02-20
Merge branch 'ob/imap-send-ssl-verify' into maint
blob
|
diff
|
raw
2013-02-07
Merge branch 'ft/transport-report-segv' into maint
blob
|
diff
|
raw
2013-02-07
Merge branch 'sb/gpg-plug-fd-leak' into maint
blob
|
diff
|
raw
2013-02-06
Merge branch 'sb/gpg-plug-fd-leak'
blob
|
diff
|
raw
2013-02-06
Merge branch 'ft/transport-report-segv'
blob
|
diff
|
raw
2013-02-04
Merge branch 'dl/am-hg-locale' into maint
blob
|
diff
|
raw
2013-01-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2013-01-28
Merge branch 'dl/am-hg-locale'
blob
|
diff
|
raw
2013-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2013-01-14
Merge branch 'jk/maint-fast-import-doc-reorder' into...
blob
|
diff
|
raw
2013-01-14
Merge branch 'jk/shortlog-no-wrap-doc' into maint
blob
|
diff
|
raw
2013-01-14
Merge branch 'jk/maint-fast-import-doc-dedup-done'...
blob
|
diff
|
raw
2013-01-14
Merge branch 'rs/leave-base-name-in-name-field-of-tar...
blob
|
diff
|
raw
2013-01-14
Merge branch 'jl/interrupt-clone-remove-separate-git...
blob
|
diff
|
raw
2013-01-12
Merge branch 'jk/maint-fast-import-doc-reorder'
blob
|
diff
|
raw
2013-01-12
Merge branch 'jk/shortlog-no-wrap-doc'
blob
|
diff
|
raw
2013-01-12
Merge branch 'os/gitweb-highlight-uncaptured' into...
blob
|
diff
|
raw
2013-01-10
Merge branch 'ta/remove-stale-translated-tut' into...
blob
|
diff
|
raw
2013-01-10
Merge branch 'rs/leave-base-name-in-name-field-of-tar'
blob
|
diff
|
raw
2013-01-10
Merge branch 'jl/interrupt-clone-remove-separate-git...
blob
|
diff
|
raw
2013-01-09
Merge branch 'os/gitweb-highlight-uncaptured'
blob
|
diff
|
raw
2013-01-08
Merge branch 'ta/remove-stale-translated-tut'
blob
|
diff
|
raw
2013-01-08
Merge branch 'jk/maint-fast-import-doc-dedup-done'
blob
|
diff
|
raw
2012-11-19
Merge branch 'jc/test-say-color-avoid-echo-escape'...
blob
|
diff
|
raw
2012-11-15
Merge branch 'jc/maint-fetch-tighten-refname-check'
blob
|
diff
|
raw
2012-11-09
Merge branch 'nd/tree-walk-enum-cleanup'
blob
|
diff
|
raw
2012-10-25
Merge branch 'jc/test-say-color-avoid-echo-escape'
blob
|
diff
|
raw
2012-10-17
Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
2012-10-17
Merge branch 'jc/maint-t1450-fsck-order-fix' into maint
blob
|
diff
|
raw
2012-10-17
Merge branch 'jc/ll-merge-binary-ours' into maint
blob
|
diff
|
raw
2012-10-08
Merge branch 'jc/maint-t1450-fsck-order-fix'
blob
|
diff
|
raw
2012-10-08
Merge branch 'jc/merge-bases-paint-fix'
blob
|
diff
|
raw
2012-10-08
Merge branch 'os/commit-submodule-ignore' into maint
blob
|
diff
|
raw
2012-10-08
Merge branch 'lt/mailinfo-handle-attachment-more-sanely...
blob
|
diff
|
raw
2012-10-03
Merge branch 'lt/mailinfo-handle-attachment-more-sanely'
blob
|
diff
|
raw
2012-10-01
Merge branch 'os/commit-submodule-ignore'
blob
|
diff
|
raw
2012-09-20
Merge branch 'dg/run-command-child-cleanup' into maint
blob
|
diff
|
raw
2012-09-20
Merge branch 'sn/ls-remote-get-url-doc' into maint
blob
|
diff
|
raw
2012-09-18
Merge branch 'er/doc-fast-import-done' into maint
blob
|
diff
|
raw
2012-09-15
Merge branch 'jc/ll-merge-binary-ours'
blob
|
diff
|
raw
2012-09-15
Merge branch 'dg/run-command-child-cleanup'
blob
|
diff
|
raw
2012-09-15
Merge branch 'sb/send-email-reconfirm-fix' into maint
blob
|
diff
|
raw
2012-09-15
Merge branch 'jc/send-email-reconfirm' into maint
blob
|
diff
|
raw
2012-09-15
Merge branch 'rj/test-regex' into maint-1.7.11
blob
|
diff
|
raw
2012-09-15
Merge branch 'da/gitk-reload-tag-contents' into maint...
blob
|
diff
|
raw
2012-09-14
Merge branch 'sn/ls-remote-get-url-doc'
blob
|
diff
|
raw
2012-09-12
Merge branch 'sb/send-email-reconfirm-fix'
blob
|
diff
|
raw
2012-09-12
Merge branch 'jc/apply-binary-p0' into maint-1.7.11
blob
|
diff
|
raw
2012-09-12
Merge branch 'jc/maint-doc-checkout-b-always-takes...
blob
|
diff
|
raw
2012-09-12
Merge branch 'kk/maint-for-each-ref-multi-sort' into...
blob
|
diff
|
raw
2012-09-12
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2012-09-12
Merge branch 'da/gitk-reload-tag-contents'
blob
|
diff
|
raw
2012-09-11
Merge branch 'rj/test-regex'
blob
|
diff
|
raw
2012-09-11
Merge branch 'jc/merge-bases'
blob
|
diff
|
raw
2012-09-11
Merge branch 'ph/stash-rerere' into maint-1.7.11
blob
|
diff
|
raw
2012-09-11
Merge branch 'jc/maint-sane-execvp-notdir' into maint...
blob
|
diff
|
raw
2012-09-11
Merge branch 'mh/maint-config-doc-proxy-command' into...
blob
|
diff
|
raw
2012-09-11
Merge branch 'jk/docs-docbook-monospace-display' into...
blob
|
diff
|
raw
next