Andrew's git - gitweb.git/history

[gitweb.git] / builtin / merge.c

2011-03-04	Merge branch 'mg/maint-difftool-vim-readonly'	blob \| diff \| raw
2011-03-04	Merge branch 'jn/maint-commit-missing-template'	blob \| diff \| raw
2011-03-04	Merge branch 'jk/diffstat-binary'	blob \| diff \| raw
2011-03-04	Merge branch 'lt/rename-no-extra-copy-detection'	blob \| diff \| raw
2011-03-04	Merge branch 'jn/test-terminal-punt-on-osx-breakage'	blob \| diff \| raw
2011-03-04	Merge branch 'jk/fail-null-clone'	blob \| diff \| raw
2011-03-04	Merge branch 'jc/grep--no-index-pathspec-fix'	blob \| diff \| raw
2011-03-02	Merge branch 'maint'	blob \| diff \| raw
2011-03-01	Merge branch 'svn-fe' of git://repo.or.cz/git/jrn	blob \| diff \| raw
2011-02-28	Merge branch 'jh/push-default-upstream-configname'	blob \| diff \| raw
2011-02-28	Merge branch 'lp/config-vername-check'	blob \| diff \| raw
2011-02-28	Merge branch 'mg/placeholders-are-lowercase'	blob \| diff \| raw
2011-02-28	Merge branch 'mg/patch-id'	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'mz/rerere-remaining'	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'nd/sorted-builtin-command-list'	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'js/maint-merge-use-prepare-commit-msg...	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'nd/hash-object-sanity'	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'va/p4'	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'pw/p4'	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'uk/checkout-ambiguous-ref'	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'sp/maint-smart-http-sans-100-continue'	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'mo/perl-bidi-pipe-envfix'	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'hv/mingw-fs-funnies'	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'en/object-list-with-pathspec'	blob \| diff \| raw \| diff to current
2011-02-28	Merge branch 'nd/struct-pathspec'	blob \| diff \| raw \| diff to current
2011-02-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-02-26	Merge commit 'jn/svn-fe' of git://github.com/gitster...	blob \| diff \| raw \| diff to current
2011-02-22	Introduce CHERRY_PICK_HEAD	blob \| diff \| raw \| diff to current
2011-02-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-02-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-02-21	merge: enable progress reporting for rename detection	blob \| diff \| raw \| diff to current
2011-02-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-02-16	Merge branch 'maint-1.7.3' into maint	blob \| diff \| raw \| diff to current
2011-02-16	Merge branch 'maint-1.7.2' into maint-1.7.3	blob \| diff \| raw \| diff to current
2011-02-16	Merge branch 'maint-1.7.1' into maint-1.7.2	blob \| diff \| raw \| diff to current
2011-02-16	Merge branch 'maint-1.7.0' into maint-1.7.1	blob \| diff \| raw \| diff to current
2011-02-15	merge: honor prepare-commit-msg hook	blob \| diff \| raw \| diff to current
2011-02-15	Make <identifier> lowercase as per CodingGuidelines	blob \| diff \| raw \| diff to current
2011-02-15	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-02-15	commit,merge,tag: describe -m likewise	blob \| diff \| raw \| diff to current
2011-02-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'tr/merge-unborn-clobber'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'jc/unpack-trees'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'jc/fsck-fixes'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'tr/diff-words-test'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'rr/fi-import-marks-if-exists'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'jn/unpack-lstat-failure-report'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'ef/alias-via-run-command'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'cb/setup'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'ae/better-template-failure-report'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'jn/cherry-pick-strategy-option'	blob \| diff \| raw \| diff to current
2011-02-10	Merge branch 'maint-1.7.0' into maint	blob \| diff \| raw \| diff to current
2011-01-31	Merge branch 'jl/fetch-submodule-recursive' into maint	blob \| diff \| raw \| diff to current
2011-01-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-01-27	Merge branch 'jn/fast-import-empty-tree-removal' into...	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'jk/diff-driver-binary-doc' into maint	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'tr/submodule-relative-scp-url' into maint	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'jn/maint-fast-import-object-reuse' into...	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'jn/submodule-b-current' into maint	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'jc/maint-svn-info-test-fix' into maint	blob \| diff \| raw \| diff to current
2011-01-19	Merge branch 'nd/maint-relative' into maint	blob \| diff \| raw \| diff to current
2011-01-13	Merge branch 'jn/gitweb-no-logo'	blob \| diff \| raw \| diff to current
2011-01-13	Merge branch 'jk/diff-driver-binary-doc'	blob \| diff \| raw \| diff to current
2011-01-13	Merge branch 'tr/submodule-relative-scp-url'	blob \| diff \| raw \| diff to current
2011-01-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-01-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-01-10	Merge branch 'maint-1.7.2' into maint	blob \| diff \| raw \| diff to current
2011-01-10	Merge branch 'maint-1.7.1' into maint-1.7.2	blob \| diff \| raw \| diff to current
2011-01-10	Merge branch 'maint-1.7.0' into maint-1.7.1	blob \| diff \| raw \| diff to current
2011-01-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-01-05	Merge branch 'maint' to sync with 1.7.3.5	blob \| diff \| raw \| diff to current
2011-01-05	Merge branch 'jn/svn-fe' (early part)	blob \| diff \| raw \| diff to current
2011-01-05	Merge branch 'ao/t9001-fix'	blob \| diff \| raw \| diff to current
2011-01-05	Merge branch 'mg/cvsimport'	blob \| diff \| raw \| diff to current
2011-01-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-12-28	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-12-28	Merge branch 'kb/maint-status-cquote' into maint	blob \| diff \| raw \| diff to current
2010-12-28	cherry-pick/revert: add support for -X/--strategy-option	blob \| diff \| raw \| diff to current
2010-12-28	Merge branch 'jc/maint-rebase-rewrite-last-skip'	blob \| diff \| raw \| diff to current
2010-12-28	Merge branch 'nd/setup'	blob \| diff \| raw \| diff to current
2010-12-26	Merge branch 'rs/maint-diff-fd-leak' into maint	blob \| diff \| raw \| diff to current
2010-12-23	Merge branch 'rj/maint-difftool-cygwin-workaround'	blob \| diff \| raw \| diff to current
2010-12-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-12-22	Merge branch 'rj/maint-test-fixes'	blob \| diff \| raw \| diff to current
2010-12-22	Merge branch 'jc/maint-am-abort-safely'	blob \| diff \| raw \| diff to current
2010-12-22	Merge branch 'jk/commit-die-on-bogus-ident'	blob \| diff \| raw \| diff to current
2010-12-22	Merge branch 'pd/bash-4-completion'	blob \| diff \| raw \| diff to current
2010-12-22	Merge branch 'nd/maint-fix-add-typo-detection'	blob \| diff \| raw \| diff to current
2010-12-22	Merge branch 'tf/commit-list-prefix'	blob \| diff \| raw \| diff to current
2010-12-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-12-21	Merge branch 'ks/blame-worktree-textconv-cached'	blob \| diff \| raw \| diff to current
2010-12-21	Merge branch 'jk/maint-decorate-01-bool'	blob \| diff \| raw \| diff to current
2010-12-21	Merge branch 'nd/oneline-sha1-name-from-specific-ref'	blob \| diff \| raw \| diff to current
2010-12-21	Merge branch 'jn/maint-gitweb-pathinfo-fix'	blob \| diff \| raw \| diff to current
2010-12-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-12-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-12-16	Merge branch 'kb/diff-C-M-synonym'	blob \| diff \| raw \| diff to current
2010-12-16	Merge branch 'jn/fast-import-blob-access'	blob \| diff \| raw \| diff to current
next