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

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

2010-11-05	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw
2010-11-05	Merge branch 'maint'	blob \| diff \| raw
2010-10-27	Merge branch 'ab/send-email-perl'	blob \| diff \| raw
2010-10-27	Merge branch 'sb/send-email-use-to-from-input'	blob \| diff \| raw
2010-10-27	Merge branch 'ab/require-perl-5.8'	blob \| diff \| raw
2010-10-27	Merge branch 'jp/send-email-to-cmd'	blob \| diff \| raw
2010-10-27	Merge branch 'as/daemon-multi-listen'	blob \| diff \| raw
2010-10-27	Merge branch 'dm/mergetool-vimdiff'	blob \| diff \| raw
2010-10-27	Merge branch 'kf/post-receive-sample-hook'	blob \| diff \| raw
2010-10-27	Merge branch 'jf/merge-ignore-ws'	blob \| diff \| raw
2010-10-27	Merge branch 'en/tree-walk-optim'	blob \| diff \| raw \| diff to current
2010-10-06	Merge branch 'mg/reset-doc'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'tr/send-email-refuse-sending-unedited...	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'jc/grep-header-all-match-fix'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'rr/format-patch-count-without-merges'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'jc/pickaxe-grep'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'gb/shell-ext'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'rr/fmt-merge-msg'	blob \| diff \| raw \| diff to current
2010-09-29	Merge branch 'po/etc-gitattributes'	blob \| diff \| raw \| diff to current
2010-09-18	Merge branch 'js/ls-files-x-doc'	blob \| diff \| raw \| diff to current
2010-09-15	Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'	blob \| diff \| raw \| diff to current
2010-09-15	Merge branch 'os/fix-rebase-diff-no-prefix'	blob \| diff \| raw \| diff to current
2010-09-15	Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'	blob \| diff \| raw \| diff to current
2010-09-15	Merge branch 'ch/maint-cannot-create-bundle-error'	blob \| diff \| raw \| diff to current
2010-09-15	Merge branch 'ks/recursive-rename-add-identical'	blob \| diff \| raw \| diff to current
2010-09-15	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2010-09-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-09-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-09-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'tf/cleanup-builtin-help-headers'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'jk/test-must-fail-missing'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'jh/error-removing-missing-note'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'kf/askpass-config'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'bc/maint-fetch-url-only'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'jk/maint-pass-c-config-in-env'	blob \| diff \| raw \| diff to current
2010-09-08	Merge branch 'en/d-f-conflict-fix'	blob \| diff \| raw \| diff to current
2010-09-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-09-06	Merge branch 'jh/clean-exclude'	blob \| diff \| raw \| diff to current
2010-09-06	Merge branch 'jl/maint-fix-test'	blob \| diff \| raw \| diff to current
2010-09-06	Merge branch 'maint' v1.7.3-rc0	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'jl/submodule-ignore-diff'	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'ab/test-2'	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'js/detached-stash'	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'js/maint-reflog-beyond-horizon'	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'dg/local-mod-error-messages'	blob \| diff \| raw \| diff to current
2010-09-04	Merge branch 'nd/maint-fix-replace'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'ab/compat-regex'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'nd/clone-depth-zero'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jn/maint-doc-user-manual-html-doctype'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'cb/maint-mergetool-no-tty'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jn/apply-filename-with-sp'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jn/merge-custom-no-trivial'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jc/maint-doc-em-dash'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'mg/doc-bundle'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jn/doc-backslash'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jn/update-contrib-example-merge'	blob \| diff \| raw \| diff to current
2010-09-03	Merge branch 'jn/merge-renormalize'	blob \| diff \| raw \| diff to current
2010-08-26	ll-merge: replace flag argument with options struct	blob \| diff \| raw
2010-08-06	ll-merge: make flag easier to populate	blob \| diff \| raw \| diff to current
2010-08-06	Documentation/technical: document ll_merge	blob \| diff \| raw \| diff to current