Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Sync with maint
[gitweb.git]
/
Documentation
/
technical
/
trivial-merge.txt
2013-07-19
Merge branch 'jc/t1512-fix' into maint
blob
|
diff
|
raw
2013-07-15
Merge branch 'tr/maint-apply-non-git-patch-parsefix...
blob
|
diff
|
raw
2013-07-12
Merge branch 'rs/pickaxe-simplify'
blob
|
diff
|
raw
2013-07-11
Merge branch 'jc/t1512-fix'
blob
|
diff
|
raw
2013-07-11
Merge branch 'jc/maint-diff-core-safecrlf'
blob
|
diff
|
raw
2013-06-26
Merge branch 'tr/maint-apply-non-git-patch-parsefix'
blob
|
diff
|
raw
2013-06-17
Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
2013-05-29
Merge branch 'as/check-ignore'
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-05-09
Merge branch 'tr/copy-revisions-from-stdin' into maint
blob
|
diff
|
raw
2013-04-26
Merge branch 'ph/rebase-original'
blob
|
diff
|
raw
2013-04-24
Merge branch 'sr/log-SG-no-textconv' into maint
blob
|
diff
|
raw
2013-04-19
Merge branch 'tr/copy-revisions-from-stdin'
blob
|
diff
|
raw
2013-04-12
Merge branch 'sr/log-SG-no-textconv'
blob
|
diff
|
raw
2013-04-04
Merge branch 'nd/index-pack-threaded-fixes' into maint
blob
|
diff
|
raw
2013-04-04
Merge branch 'jk/index-pack-correct-depth-fix' into...
blob
|
diff
|
raw
2013-04-04
Merge branch 'jk/peel-ref' into maint
blob
|
diff
|
raw
2013-04-03
Merge branch 'lf/setup-prefix-pathspec' into maint
blob
|
diff
|
raw
2013-04-03
Merge branch 'jk/checkout-attribute-lookup' into maint...
blob
|
diff
|
raw
2013-04-03
Merge branch 'jk/fully-peeled-packed-ref' 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 'jc/perl-cat-blob' into maint-1.8.1
blob
|
diff
|
raw
2013-04-03
Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
blob
|
diff
|
raw
2013-04-03
Merge branch 'nd/index-pack-l10n-buf-overflow' into...
blob
|
diff
|
raw
2013-04-02
Merge branch 'sw/safe-create-leading-dir-race'
blob
|
diff
|
raw
2013-04-01
Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
blob
|
diff
|
raw
2013-04-01
Merge branch 'rr/tests-dedup-test-config' into maint
blob
|
diff
|
raw
2013-04-01
Merge branch 'nd/index-pack-threaded-fixes'
blob
|
diff
|
raw
2013-04-01
Merge branch 'jk/index-pack-correct-depth-fix'
blob
|
diff
|
raw
2013-04-01
Merge branch 'jc/remove-export-from-config-mak-in'
blob
|
diff
|
raw
2013-03-28
Merge branch 'rr/tests-dedup-test-config'
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 'jc/reflog-reverse-walk'
blob
|
diff
|
raw
2013-03-26
Merge branch 'jk/utf-8-can-be-spelled-differently'...
blob
|
diff
|
raw
2013-03-26
Merge branch 'jc/perl-cat-blob' into maint
blob
|
diff
|
raw
2013-03-26
Merge branch 'ob/imap-send-ssl-verify' into maint
blob
|
diff
|
raw
2013-03-26
Merge branch 'nd/index-pack-l10n-buf-overflow' into...
blob
|
diff
|
raw
2013-03-25
Merge branch 'jk/fully-peeled-packed-ref'
blob
|
diff
|
raw
2013-03-25
Merge branch 'jk/peel-ref'
blob
|
diff
|
raw
2013-03-25
Merge branch 'lf/setup-prefix-pathspec'
blob
|
diff
|
raw
2013-03-25
Merge branch 'ap/maint-diff-rename-avoid-overlap'
blob
|
diff
|
raw
2013-03-25
Merge branch 'lf/bundle-verify-list-prereqs' into maint...
blob
|
diff
|
raw
2013-03-25
Merge branch 'tk/doc-filter-branch' into maint-1.8.1
blob
|
diff
|
raw
2013-03-25
Merge branch 'dm/ni-maxhost-may-be-missing' into maint...
blob
|
diff
|
raw
2013-03-25
Merge branch 'jc/color-diff-doc' into maint-1.8.1
blob
|
diff
|
raw
2013-03-21
Merge branch 'jk/utf-8-can-be-spelled-differently'
blob
|
diff
|
raw
2013-03-21
Merge branch 'jc/perl-cat-blob'
blob
|
diff
|
raw
2013-03-21
Merge branch 'ob/imap-send-ssl-verify'
blob
|
diff
|
raw
2013-03-21
Merge branch 'nd/index-pack-l10n-buf-overflow'
blob
|
diff
|
raw
2013-03-19
Merge branch 'lf/bundle-verify-list-prereqs'
blob
|
diff
|
raw
2013-03-19
Merge branch 'tk/doc-filter-branch'
blob
|
diff
|
raw
2013-03-19
Merge branch 'dm/ni-maxhost-may-be-missing'
blob
|
diff
|
raw
2013-03-19
Merge branch 'jc/color-diff-doc'
blob
|
diff
|
raw
2013-03-13
Merge branch 'jc/reflog-reverse-walk' into nd/branch...
blob
|
diff
|
raw
2013-03-07
Merge branch 'mh/maint-ceil-absolute' into maint
blob
|
diff
|
raw
2013-02-27
Merge branch 'wk/man-deny-current-branch-is-default...
blob
|
diff
|
raw
2013-02-27
Merge branch 'jn/less-reconfigure' into maint
blob
|
diff
|
raw
2013-02-27
Merge branch 'mh/maint-ceil-absolute'
blob
|
diff
|
raw
2013-02-25
Merge branch 'jn/less-reconfigure'
blob
|
diff
|
raw
2013-02-25
Merge branch 'as/check-ignore'
blob
|
diff
|
raw
2013-02-25
Merge branch 'ct/autoconf-htmldir'
blob
|
diff
|
raw
2013-02-25
Merge branch 'wk/man-deny-current-branch-is-default...
blob
|
diff
|
raw
2013-02-25
Merge branch 'jc/mention-tracking-for-pull-default...
blob
|
diff
|
raw
2013-02-25
Merge branch 'al/mergetool-printf-fix' into maint
blob
|
diff
|
raw
2013-02-25
Merge branch 'mg/bisect-doc' into maint
blob
|
diff
|
raw
2013-02-25
Merge branch 'jc/combine-diff-many-parents' into maint
blob
|
diff
|
raw
2013-02-25
Merge branch 'jk/apply-similaritly-parsing' into maint
blob
|
diff
|
raw
2013-02-25
Merge branch 'zk/clean-report-failure' into maint
blob
|
diff
|
raw
2013-02-25
Merge branch 'nd/clone-no-separate-git-dir-with-bare...
blob
|
diff
|
raw
2013-02-20
Merge branch 'ob/imap-send-ssl-verify' into maint
blob
|
diff
|
raw
2013-02-19
Merge branch 'jc/mention-tracking-for-pull-default'
blob
|
diff
|
raw
2013-02-15
Merge branch 'wk/man-deny-current-branch-is-default...
blob
|
diff
|
raw
2013-02-14
Merge branch 'al/mergetool-printf-fix'
blob
|
diff
|
raw
2013-02-14
Merge branch 'mg/bisect-doc'
blob
|
diff
|
raw
2013-02-14
Merge branch 'jc/extended-fake-ancestor-for-gitlink'
blob
|
diff
|
raw
2013-02-08
Merge branch 'jc/combine-diff-many-parents'
blob
|
diff
|
raw
2013-02-08
Merge branch 'jk/apply-similaritly-parsing'
blob
|
diff
|
raw
2013-02-08
Merge branch 'ct/autoconf-htmldir'
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-07
Merge branch 'jc/fake-ancestor-with-non-blobs' into...
blob
|
diff
|
raw
2013-02-07
Merge branch 'jn/auto-depend-workaround-buggy-ccache...
blob
|
diff
|
raw
2013-02-07
Merge branch 'da/mergetool-docs'
blob
|
diff
|
raw
2013-02-07
Merge branch 'jk/mergetool'
blob
|
diff
|
raw
2013-02-07
Merge branch 'sb/run-command-fd-error-reporting'
blob
|
diff
|
raw
2013-02-06
Merge branch 'jn/auto-depend-workaround-buggy-ccache'
blob
|
diff
|
raw
2013-02-06
Merge branch 'jc/fake-ancestor-with-non-blobs'
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 'jc/push-reject-reasons'
blob
|
diff
|
raw
2013-02-04
Merge branch 'nd/edit-branch-desc-while-detached' into...
blob
|
diff
|
raw
2013-02-04
Merge branch 'jn/do-not-drop-username-when-reading...
blob
|
diff
|
raw
2013-02-04
Merge branch 'dl/am-hg-locale' into maint
blob
|
diff
|
raw
2013-02-04
Merge branch 'jc/doc-maintainer' into maint
blob
|
diff
|
raw
2013-02-01
Merge branch 'nd/edit-branch-desc-while-detached'
blob
|
diff
|
raw
2013-02-01
Merge branch 'jn/do-not-drop-username-when-reading...
blob
|
diff
|
raw
2013-02-01
Merge branch 'jc/no-git-config-in-clone'
blob
|
diff
|
raw
2013-01-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
next