git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - builtin/merge-file.c

projects / thirdparty / git.git / history

[thirdparty/git.git] / builtin / merge-file.c

2010-11-30	Junio C Hamano	Merge branch 'cb/leading-path-removal'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'en/merge-recursive'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'jl/clone-recurse-sm-synonym'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'jn/cherry-pick-refresh-index'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'jc/emfile'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'md/interix'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'jl/add-p-reverse-message'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'np/pack-broken-boundary'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'np/diff-in-corrupt-repository'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'fc/apply-p2-get-header-name'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'jn/fast-import-fix'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'rr/needs-clean-work-tree'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'kb/blame-author-email'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'cm/diff-check-at-eol'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'ak/apply-non-git-epoch'	blob \| commitdiff \| raw
2010-11-30	Junio C Hamano	Merge branch 'tc/smart-http-post-redirect'	blob \| commitdiff \| raw
2010-11-26	Junio C Hamano	Merge branch 'en/and-cascade-tests'	blob \| commitdiff \| raw
2010-11-24	Junio C Hamano	Merge branch 'cb/maint-orphan-merge-noclobber'	blob \| commitdiff \| raw
2010-11-24	Junio C Hamano	Merge branch 'ao/send-email-irt'	blob \| commitdiff \| raw
2010-11-24	Junio C Hamano	Merge branch 'jk/add-e-doc'	blob \| commitdiff \| raw
2010-11-24	Junio C Hamano	Merge branch 'rs/opt-help-text'	blob \| commitdiff \| raw
2010-11-24	Junio C Hamano	Merge branch 'kb/maint-rebase-autosquash'	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'mm/phrase-remote-tracking'	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'en/and-cascade-tests'	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'cb/diff-fname-optim' into maint	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'jk/no-textconv-symlink' into maint	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'aw/git-p4-deletion' into maint	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'kf/post-receive-sample-hook' into maint	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'mg/reset-doc' into maint	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'tr/send-email-refuse-sending-unedited...	blob \| commitdiff \| raw \| diff to current
2010-11-24	Junio C Hamano	Merge branch 'ef/mingw-daemon'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jl/maint-pull-tags-doc'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'kb/maint-submodule-savearg'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jk/missing-config'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'kb/maint-diff-ws-check'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'bg/maint-gitweb-test-lib'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jm/mailmap'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'tr/maint-git-repack-tmpfile'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jk/maint-apply-no-binary'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jk/push-progress'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'tr/maint-merge-file-subdir'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'ks/no-textconv-symlink'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'cb/diff-fname-optim'	blob \| commitdiff \| raw \| diff to current
2010-11-17	Junio C Hamano	Merge branch 'jk/no-textconv-symlink'	blob \| commitdiff \| raw \| diff to current
2010-11-15	Jonathan Nieder	Describe various forms of "be quiet" using OPT__QUIET	blob \| commitdiff \| raw \| diff to current
2010-11-15	René Scharfe	add description parameter to OPT__QUIET	blob \| commitdiff \| raw \| diff to current
2010-11-05	Junio C Hamano	Merge branch 'aw/git-p4-deletion'	blob \| commitdiff \| raw \| diff to current
2010-11-05	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'kb/merge-recursive-rename-threshold'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'as/daemon-multi-listen'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'kf/post-receive-sample-hook'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'jf/merge-ignore-ws'	blob \| commitdiff \| raw \| diff to current
2010-10-27	Junio C Hamano	Merge branch 'en/tree-walk-optim'	blob \| commitdiff \| raw \| diff to current
2010-10-18	Thomas Rast	merge-file: correctly find files when called in subdir	blob \| commitdiff \| raw \| diff to current
2010-10-06	Junio C Hamano	Merge branch 'mg/reset-doc'	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'tr/send-email-refuse-sending-unedited...	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'jc/grep-header-all-match-fix'	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'rr/format-patch-count-without-merges'	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'jc/pickaxe-grep'	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'gb/shell-ext'	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'rr/fmt-merge-msg'	blob \| commitdiff \| raw \| diff to current
2010-09-29	Junio C Hamano	Merge branch 'po/etc-gitattributes'	blob \| commitdiff \| raw \| diff to current
2010-09-18	Junio C Hamano	Merge branch 'js/ls-files-x-doc'	blob \| commitdiff \| raw \| diff to current
2010-09-15	Junio C Hamano	Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'	blob \| commitdiff \| raw \| diff to current
2010-09-15	Junio C Hamano	Merge branch 'os/fix-rebase-diff-no-prefix'	blob \| commitdiff \| raw \| diff to current
2010-09-15	Junio C Hamano	Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'	blob \| commitdiff \| raw \| diff to current
2010-09-15	Junio C Hamano	Merge branch 'ch/maint-cannot-create-bundle-error'	blob \| commitdiff \| raw \| diff to current
2010-09-15	Junio C Hamano	Merge branch 'ks/recursive-rename-add-identical'	blob \| commitdiff \| raw \| diff to current
2010-09-15	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2010-09-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-09-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-09-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-09-08	Junio C Hamano	Merge branch 'jk/test-must-fail-missing'	blob \| commitdiff \| raw \| diff to current
2010-09-08	Junio C Hamano	Merge branch 'jh/error-removing-missing-note'	blob \| commitdiff \| raw \| diff to current
2010-09-08	Junio C Hamano	Merge branch 'kf/askpass-config'	blob \| commitdiff \| raw \| diff to current
2010-09-08	Junio C Hamano	Merge branch 'bc/maint-fetch-url-only'	blob \| commitdiff \| raw \| diff to current
2010-09-08	Junio C Hamano	Merge branch 'jk/maint-pass-c-config-in-env'	blob \| commitdiff \| raw \| diff to current
2010-09-08	Junio C Hamano	Merge branch 'en/d-f-conflict-fix'	blob \| commitdiff \| raw \| diff to current
2010-09-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-09-06	Junio C Hamano	Merge branch 'jh/clean-exclude'	blob \| commitdiff \| raw \| diff to current
2010-09-06	Junio C Hamano	Merge branch 'jl/maint-fix-test'	blob \| commitdiff \| raw \| diff to current
2010-09-06	Junio C Hamano	Merge branch 'maint' v1.7.3-rc0	blob \| commitdiff \| raw \| diff to current
2010-09-06	Junio C Hamano	Merge branch 'xx/trivial' into maint	blob \| commitdiff \| raw \| diff to current
2010-09-04	Junio C Hamano	Merge branch 'jl/submodule-ignore-diff'	blob \| commitdiff \| raw \| diff to current
2010-09-04	Junio C Hamano	Merge branch 'ab/test-2'	blob \| commitdiff \| raw \| diff to current
2010-09-04	Junio C Hamano	Merge branch 'js/detached-stash'	blob \| commitdiff \| raw \| diff to current
2010-09-04	Junio C Hamano	Merge branch 'js/maint-reflog-beyond-horizon'	blob \| commitdiff \| raw \| diff to current
2010-09-04	Junio C Hamano	Merge branch 'dg/local-mod-error-messages'	blob \| commitdiff \| raw \| diff to current
2010-09-04	Junio C Hamano	Merge branch 'nd/maint-fix-replace'	blob \| commitdiff \| raw \| diff to current
2010-09-03	Junio C Hamano	Merge branch 'ab/compat-regex'	blob \| commitdiff \| raw \| diff to current
2010-09-03	Junio C Hamano	Merge branch 'nd/clone-depth-zero'	blob \| commitdiff \| raw \| diff to current
2010-09-03	Junio C Hamano	Merge branch 'jn/maint-doc-user-manual-html-doctype'	blob \| commitdiff \| raw \| diff to current
2010-09-03	Junio C Hamano	Merge branch 'cb/maint-mergetool-no-tty'	blob \| commitdiff \| raw \| diff to current
2010-09-03	Junio C Hamano	Merge branch 'jn/apply-filename-with-sp'	blob \| commitdiff \| raw \| diff to current
2010-09-03	Junio C Hamano	Merge branch 'jn/merge-custom-no-trivial'	blob \| commitdiff \| raw \| diff to current
2010-09-03	Junio C Hamano	Merge branch 'jc/maint-doc-em-dash'	blob \| commitdiff \| raw \| diff to current
2010-09-03	Junio C Hamano	Merge branch 'mg/doc-bundle'	blob \| commitdiff \| raw \| diff to current
2010-09-03	Junio C Hamano	Merge branch 'jn/doc-backslash'	blob \| commitdiff \| raw \| diff to current
2010-09-03	Junio C Hamano	Merge branch 'jn/update-contrib-example-merge'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom