Andrew's git - gitweb.git/history - Documentation/technical/trivial-merge.txt

[gitweb.git] / Documentation / technical / trivial-merge.txt

2013-01-29	Merge branch 'ph/rebase-preserve-all-merges' into maint	blob \| diff \| raw
2013-01-28	Merge branch 'ss/help-htmlpath-config-doc' into maint	blob \| diff \| raw
2013-01-28	Merge branch 'nd/attr-debug-fix' into maint	blob \| diff \| raw
2013-01-28	Merge branch 'ds/completion-silence-in-tree-path-probe...	blob \| diff \| raw
2013-01-28	Merge branch 'jn/maint-trim-vim-contrib' into maint	blob \| diff \| raw
2013-01-28	Merge branch 'pe/doc-email-env-is-trumped-by-config...	blob \| diff \| raw
2013-01-28	Merge branch 'ap/status-ignored-in-ignored-directory...	blob \| diff \| raw
2013-01-28	Merge branch 'mh/ceiling' into maint	blob \| diff \| raw
2013-01-28	Merge branch 'tb/t0050-maint'	blob \| diff \| raw
2013-01-28	Merge branch 'dl/am-hg-locale'	blob \| diff \| raw
2013-01-27	Merge branch 'jk/maint-gc-auto-after-fetch' into jk...	blob \| diff \| raw
2013-01-25	Merge branch 'nd/retire-fnmatch'	blob \| diff \| raw
2013-01-25	Merge branch 'jc/doc-maintainer'	blob \| diff \| raw
2013-01-24	Merge branch 'ch/add-auto-submitted-in-sample-post...	blob \| diff \| raw
2013-01-24	Merge branch 'as/check-ignore'	blob \| diff \| raw
2013-01-24	Merge branch 'rs/clarify-entry-cmp-sslice'	blob \| diff \| raw
2013-01-24	Merge branch 'cr/push-force-tag-update'	blob \| diff \| raw
2013-01-24	Merge branch 'mo/cvs-server-updates'	blob \| diff \| raw
2013-01-23	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw
2013-01-22	Merge branch 'zk/clean-report-failure'	blob \| diff \| raw
2013-01-22	Merge branch 'ph/rebase-preserve-all-merges'	blob \| diff \| raw
2013-01-22	Merge branch 'nd/clone-no-separate-git-dir-with-bare'	blob \| diff \| raw
2013-01-21	Merge branch 'nz/send-email-headers-are-case-insensitiv...	blob \| diff \| raw
2013-01-21	Merge branch 'rs/zip-with-uncompressed-size-in-the...	blob \| diff \| raw
2013-01-18	Merge branch 'ss/help-htmlpath-config-doc'	blob \| diff \| raw
2013-01-18	Merge branch 'nd/attr-debug-fix'	blob \| diff \| raw
2013-01-18	Merge branch 'rs/pretty-use-prefixcmp'	blob \| diff \| raw
2013-01-18	Merge branch 'ds/completion-silence-in-tree-path-probe'	blob \| diff \| raw
2013-01-18	Merge branch 'jn/maint-trim-vim-contrib'	blob \| diff \| raw
2013-01-18	Merge branch 'pe/doc-email-env-is-trumped-by-config'	blob \| diff \| raw
2013-01-14	Merge branch 'jc/blame-no-follow'	blob \| diff \| raw
2013-01-14	Merge branch 'fc/remote-testgit-feature-done'	blob \| diff \| raw
2013-01-14	Merge branch 'nd/upload-pack-shallow-must-be-commit'	blob \| diff \| raw
2013-01-14	Merge branch 'ap/status-ignored-in-ignored-directory'	blob \| diff \| raw
2013-01-14	Merge branch 'nz/send-email-headers-are-case-insensitive'	blob \| diff \| raw
2013-01-14	Merge branch 'jk/unify-exit-code-by-receiving-signal...	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 'jc/comment-cygwin-win32api-in-makefile...	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-14	Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credi...	blob \| diff \| raw
2013-01-14	Merge branch 'jc/apply-trailing-blank-removal' into...	blob \| diff \| raw
2013-01-14	Merge branch 'pf/editor-ignore-sigint' into maint	blob \| diff \| raw
2013-01-14	Merge branch 'mk/maint-graph-infinity-loop' into maint	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 'rs/zip-with-uncompressed-size-in-the...	blob \| diff \| raw
2013-01-12	Merge branch 'jk/unify-exit-code-by-receiving-signal'	blob \| diff \| raw
2013-01-12	Merge branch 'jc/format-patch-reroll'	blob \| diff \| raw
2013-01-12	Merge branch 'as/api-allocation-doc' into maint	blob \| diff \| raw
2013-01-12	Merge branch 'os/gitweb-highlight-uncaptured' into...	blob \| diff \| raw
2013-01-12	Merge branch 'jn/less-reconfigure' into maint	blob \| diff \| raw
2013-01-12	Merge branch 'kb/maint-bundle-doc' into maint	blob \| diff \| raw
2013-01-12	Merge branch 'jn/warn-on-inaccessible-loosen' into...	blob \| diff \| raw
2013-01-12	Merge branch 'jc/fetch-ignore-symref' into maint	blob \| diff \| raw
2013-01-12	Merge branch 'ss/svn-prompt' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'ta/remove-stale-translated-tut' into...	blob \| diff \| raw
2013-01-10	Merge branch 'tb/test-t9020-no-which' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'mh/pthreads-autoconf' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'jc/same-encoding' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'sp/shortlog-missing-lf' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'md/gitweb-sort-by-age' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'nd/invalidate-i-t-a-cache-tree' into...	blob \| diff \| raw
2013-01-10	Merge branch 'jk/repack-ref-racefix' into maint	blob \| diff \| raw
2013-01-10	Merge branch 'rb/http-cert-cred-no-username-prompt...	blob \| diff \| raw
2013-01-10	Merge branch 'jc/comment-cygwin-win32api-in-makefile'	blob \| diff \| raw
2013-01-10	Merge branch 'as/api-allocation-doc'	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-10	Merge branch 'as/dir-c-cleanup'	blob \| diff \| raw
2013-01-10	Merge branch 'nd/wildmatch'	blob \| diff \| raw
2013-01-10	Merge branch 'aw/rebase-am-failure-detection'	blob \| diff \| raw
2013-01-10	Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'	blob \| diff \| raw
2013-01-09	Merge branch 'nd/maint-branch-desc-doc'	blob \| diff \| raw
2013-01-09	Merge branch 'fc/remote-bzr'	blob \| diff \| raw
2013-01-09	Merge branch 'os/gitweb-highlight-uncaptured'	blob \| diff \| raw
2013-01-09	Merge branch 'jn/less-reconfigure'	blob \| diff \| raw
2013-01-08	Merge branch 'kb/maint-bundle-doc'	blob \| diff \| raw
2013-01-08	Merge branch 'ta/remove-stale-translated-tut'	blob \| diff \| raw
2013-01-08	Merge branch 'tb/test-t9020-no-which'	blob \| diff \| raw
2013-01-08	Merge branch 'jk/maint-fast-import-doc-dedup-done'	blob \| diff \| raw
2013-01-08	Merge branch 'ms/subtree-fixlets' into maint	blob \| diff \| raw
2013-01-08	Merge branch 'jc/maint-fnmatch-old-style-definition...	blob \| diff \| raw
2013-01-08	Merge branch 'jc/maint-fbsd-sh-ifs-workaround' into...	blob \| diff \| raw
2013-01-08	Merge branch 'jc/mkstemp-more-careful-error-reporting...	blob \| diff \| raw
2013-01-08	Merge branch 'jc/maint-test-portability' into maint	blob \| diff \| raw
2013-01-07	Merge branch 'mz/oneway-merge-wo-u-no-lstat'	blob \| diff \| raw
2013-01-07	Merge branch 'cc/no-gitk-build-dependency'	blob \| diff \| raw
2013-01-07	Merge branch 'jn/warn-on-inaccessible-loosen'	blob \| diff \| raw
2013-01-07	Merge branch 'jc/apply-trailing-blank-removal'	blob \| diff \| raw
2013-01-06	Merge branch 'jc/format-color-auto'	blob \| diff \| raw
2013-01-06	Merge branch 'jc/fetch-ignore-symref'	blob \| diff \| raw
2013-01-06	Merge branch 'cr/push-force-tag-update'	blob \| diff \| raw
2013-01-06	Merge branch 'mh/unify-xml-in-imap-send-and-http-push'	blob \| diff \| raw
2013-01-06	Merge branch 'nd/pathspec-wildcard'	blob \| diff \| raw
2013-01-06	Merge branch 'jk/fsck-dot-in-trees'	blob \| diff \| raw
2013-01-06	Merge branch 'pf/editor-ignore-sigint'	blob \| diff \| raw
2013-01-03	Merge branch 'ms/subtree-fixlets'	blob \| diff \| raw
next