Andrew's git - gitweb.git/history

[gitweb.git] / builtin / merge.c

2011-04-01	Merge "checkout ambiguous ref bugfix" into maint	blob \| diff \| raw
2011-03-31	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-30	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-30	Merge branch 'svn-fe' of git://repo.or.cz/git/jrn	blob \| diff \| raw \| diff to current
2011-03-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-29	Merge branch 'jc/fetch-progressive-stride'	blob \| diff \| raw \| diff to current
2011-03-29	Merge branches 'sp/maint-fetch-pack-stop-early' and...	blob \| diff \| raw \| diff to current
2011-03-28	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-27	Merge branch 'mg/rev-list-n-parents'	blob \| diff \| raw \| diff to current
2011-03-27	Merge branch 'jc/index-update-if-able'	blob \| diff \| raw \| diff to current
2011-03-27	Merge branch 'jc/maint-rerere-in-workdir'	blob \| diff \| raw \| diff to current
2011-03-27	Merge branch 'nd/index-doc'	blob \| diff \| raw \| diff to current
2011-03-27	Merge branch 'jc/fetch-progressive-stride'	blob \| diff \| raw \| diff to current
2011-03-26	Merge branch 'svn-fe' of git://repo.or.cz/git/jrn	blob \| diff \| raw \| diff to current
2011-03-26	Merge git-gui 0.14.0	blob \| diff \| raw \| diff to current
2011-03-26	Sync with 1.7.4.2	blob \| diff \| raw \| diff to current
2011-03-25	merge: merge unborn index before setting ref	blob \| diff \| raw \| diff to current
2011-03-24	merge: merge with the default upstream branch without...	blob \| diff \| raw \| diff to current
2011-03-24	merge: match the help text with the documentation	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'kc/gitweb-pathinfo-w-anchor'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'jn/fortify-source-workaround'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'jn/maint-c99-format'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'lt/default-abbrev'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'pk/stash-apply-status-relative'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'jc/maint-diff-q-filter'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'pw/p4'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'mg/rev-list-one-side-only'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'js/maint-stash-index-copy'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'tl/p4'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'mg/doc-bisect-tweak-worktree'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'jn/test-sanitize-git-env'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'sp/maint-upload-pack-stop-early'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'sp/maint-fetch-pack-stop-early'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'jc/maint-rev-list-culled-boundary'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'jc/maint-fetch-alt'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'sg/complete-symmetric-diff'	blob \| diff \| raw \| diff to current
2011-03-23	Merge branch 'svn-fe' of git://repo.or.cz/git/jrn	blob \| diff \| raw \| diff to current
2011-03-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-21	Merge branch 'sp/maint-fd-limit' into maint	blob \| diff \| raw
2011-03-21	Merge branch 'mr/hpux' into maint	blob \| diff \| raw
2011-03-21	Merge branch 'so/submodule-no-update-first-time' into...	blob \| diff \| raw
2011-03-21	Merge branch 'mo/perl-bidi-pipe-envfix' into maint	blob \| diff \| raw
2011-03-21	Merge branch 'ae/better-template-failure-report' into...	blob \| diff \| raw
2011-03-20	Merge branch 'mm/maint-log-n-with-diff-filtering'	blob \| diff \| raw \| diff to current
2011-03-20	Merge branch 'mg/rev-list-n-reverse-doc'	blob \| diff \| raw \| diff to current
2011-03-20	Merge branch 'js/rerere-forget-always-take-pathspec'	blob \| diff \| raw \| diff to current
2011-03-20	Merge branch 'ab/i18n-basic'	blob \| diff \| raw \| diff to current
2011-03-20	Merge branch 'uk/ls-remote-in-get-remote-url'	blob \| diff \| raw \| diff to current
2011-03-20	Merge branch 'ss/mergetool--lib'	blob \| diff \| raw \| diff to current
2011-03-20	Merge branch 'jn/status-translatable'	blob \| diff \| raw \| diff to current
2011-03-20	Merge branch 'jk/trace-sifter'	blob \| diff \| raw \| diff to current
2011-03-20	Merge branch 'jk/format-patch-multiline-header'	blob \| diff \| raw \| diff to current
2011-03-20	Merge branch 'jk/merge-rename-ux'	blob \| diff \| raw \| diff to current
2011-03-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-18	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-16	Merge branch 'jn/maint-commit-missing-template' into...	blob \| diff \| raw
2011-03-16	Merge branch 'lt/rename-no-extra-copy-detection' into...	blob \| diff \| raw
2011-03-16	Merge branch 'jk/diffstat-binary' into maint	blob \| diff \| raw
2011-03-16	Merge branch 'mg/maint-difftool-vim-readonly' into...	blob \| diff \| raw
2011-03-16	Merge branch 'jn/test-terminal-punt-on-osx-breakage...	blob \| diff \| raw
2011-03-16	Merge branch 'jk/fail-null-clone' into maint	blob \| diff \| raw
2011-03-16	Merge branch 'jh/push-default-upstream-configname'...	blob \| diff \| raw
2011-03-16	Merge branch 'mg/placeholders-are-lowercase' into maint	blob \| diff \| raw
2011-03-16	Merge branch 'mg/patch-id' into maint	blob \| diff \| raw \| diff to current
2011-03-16	Merge branch 'js/maint-merge-use-prepare-commit-msg...	blob \| diff \| raw \| diff to current
2011-03-16	Merge branch 'nd/struct-pathspec'	blob \| diff \| raw \| diff to current
2011-03-15	Merge branch 'jk/strbuf-vaddf'	blob \| diff \| raw \| diff to current
2011-03-15	Merge branch 'mm/push-default-advice'	blob \| diff \| raw \| diff to current
2011-03-15	Merge branch 'jn/maint-instaweb-plack-fix'	blob \| diff \| raw \| diff to current
2011-03-15	Merge branch 'sp/maint-fd-limit'	blob \| diff \| raw \| diff to current
2011-03-15	Merge branch 'jc/checkout-orphan-warning'	blob \| diff \| raw \| diff to current
2011-03-15	Merge branch 'jh/maint-do-not-track-non-branches'	blob \| diff \| raw \| diff to current
2011-03-15	Merge branch 'fk/maint-cvsimport-early-failure'	blob \| diff \| raw \| diff to current
2011-03-15	Merge branch 'jc/maint-apply-report-offset'	blob \| diff \| raw \| diff to current
2011-03-15	Merge branch 'jc/maint-apply-no-double-patch'	blob \| diff \| raw \| diff to current
2011-03-15	Merge branch 'mr/hpux'	blob \| diff \| raw \| diff to current
2011-03-14	Merge branch 'sp/maint-smart-http-sans-100-continue'	blob \| diff \| raw \| diff to current
2011-03-13	Merge branch 'pw/p4'	blob \| diff \| raw \| diff to current
2011-03-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-10	i18n: git-merge "Wonderful" message	blob \| diff \| raw \| diff to current
2011-03-10	i18n: git-merge "Updating %s..%s" message	blob \| diff \| raw \| diff to current
2011-03-10	i18n: git-merge basic messages	blob \| diff \| raw \| diff to current
2011-03-09	Merge branch 'js/cherry-pick-usability'	blob \| diff \| raw \| diff to current
2011-03-09	Merge branch 'js/checkout-untracked-symlink'	blob \| diff \| raw \| diff to current
2011-03-09	Merge branch 'so/submodule-no-update-first-time'	blob \| diff \| raw \| diff to current
2011-03-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-04	Merge branch 'mh/p4'	blob \| diff \| raw \| diff to current
2011-03-04	Merge branch 'mg/maint-difftool-vim-readonly'	blob \| diff \| raw \| diff to current
2011-03-04	Merge branch 'jn/maint-commit-missing-template'	blob \| diff \| raw \| diff to current
2011-03-04	Merge branch 'jk/diffstat-binary'	blob \| diff \| raw \| diff to current
2011-03-04	Merge branch 'lt/rename-no-extra-copy-detection'	blob \| diff \| raw \| diff to current
2011-03-04	Merge branch 'jn/test-terminal-punt-on-osx-breakage'	blob \| diff \| raw \| diff to current
2011-03-04	Merge branch 'jk/fail-null-clone'	blob \| diff \| raw \| diff to current
2011-03-04	Merge branch 'jc/grep--no-index-pathspec-fix'	blob \| diff \| raw \| diff to current
2011-03-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-03-01	Merge branch 'svn-fe' of git://repo.or.cz/git/jrn	blob \| diff \| raw \| diff to current
next