Andrew's git - gitweb.git/history

[gitweb.git] / builtin / merge.c

2011-05-06	Merge branch 'jc/fix-diff-files-unmerged'	blob \| diff \| raw
2011-05-06	Merge branch 'cj/p4merge'	blob \| diff \| raw
2011-05-06	Merge branch 'gr/cvsimport-alternative-cvspass-location'	blob \| diff \| raw
2011-05-06	Merge branch 'sg/completion-cleanup'	blob \| diff \| raw
2011-05-06	Merge branch 'js/blame-parsename'	blob \| diff \| raw
2011-05-06	Merge branch 'jk/format-patch-quote-special-in-from'	blob \| diff \| raw
2011-05-06	Merge branch 'nd/struct-pathspec'	blob \| diff \| raw
2011-05-06	Merge branch 'aw/maint-rebase-i-p-no-ff'	blob \| diff \| raw
2011-05-06	Merge branch 'mg/alias-expose-prefix'	blob \| diff \| raw
2011-05-06	Merge branch 'mg/diff-uiconfig-doc'	blob \| diff \| raw
2011-05-06	Merge branch 'maint'	blob \| diff \| raw
2011-05-05	Merge branch 'maint'	blob \| diff \| raw
2011-05-04	Merge branch 'ml/test-readme'	blob \| diff \| raw
2011-05-04	Merge branch 'ft/gitweb-tar-with-gzip-n'	blob \| diff \| raw
2011-05-04	Merge branch 'mg/rev-list-count-cherry'	blob \| diff \| raw
2011-05-04	Merge branch 'ss/doc-svn'	blob \| diff \| raw
2011-05-04	Merge branch 'jn/format-patch-doc'	blob \| diff \| raw
2011-05-04	Merge branch 'vr/merge-base-doc'	blob \| diff \| raw
2011-05-04	Merge branch 'ss/cherry-pick-x-doc'	blob \| diff \| raw
2011-05-04	Merge branch 'jn/maint-format-patch-doc'	blob \| diff \| raw
2011-05-04	Merge branch 'jk/format-patch-multiline-header'	blob \| diff \| raw
2011-05-04	Merge branch 'jm/mergetool-submodules'	blob \| diff \| raw
2011-05-04	Sync with 1.7.5.1	blob \| diff \| raw
2011-05-04	Merge branch 'jh/dirstat' into maint	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'sp/maint-clear-postfields' into maint	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'jk/maint-stash-oob' into maint	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'jk/maint-upload-pack-shallow' into maint	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'jc/pack-objects-bigfile' into maint	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'mg/reflog-with-options' into maint	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'ar/clean-rmdir-empty' into maint	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'mg/sha1-path-advise' into maint	blob \| diff \| raw \| diff to current
2011-05-02	Merge branch 'jk/notes-ui-updates'	blob \| diff \| raw
2011-05-02	Merge branch 'ab/i18n-fixup'	blob \| diff \| raw
2011-05-02	Merge branch 'nm/submodule-update-force'	blob \| diff \| raw \| diff to current
2011-05-02	Merge branch 'jh/notes-add-ui'	blob \| diff \| raw \| diff to current
2011-05-02	Merge branch 'nd/maint-setup'	blob \| diff \| raw \| diff to current
2011-05-02	Merge branch 'mz/maint-rename-unmerged'	blob \| diff \| raw \| diff to current
2011-05-01	Merge branch 'rs/strbuf-setlen-assert'	blob \| diff \| raw \| diff to current
2011-05-01	Merge branch 'vh/git-svn-doc'	blob \| diff \| raw \| diff to current
2011-04-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-04-29	Merge branch 'mg/x-years-12-months' into maint	blob \| diff \| raw \| diff to current
2011-04-28	Merge branch 'jc/diff-irreversible-delete'	blob \| diff \| raw \| diff to current
2011-04-28	Merge branch 'jc/rename-degrade-cc-to-c'	blob \| diff \| raw \| diff to current
2011-04-28	Merge branch 'mz/rebase'	blob \| diff \| raw \| diff to current
2011-04-28	Merge branch 'en/merge-recursive'	blob \| diff \| raw \| diff to current
2011-04-28	Merge branch 'jh/dirstat'	blob \| diff \| raw \| diff to current
2011-04-28	Merge branch 'sp/maint-clear-postfields'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'mg/x-years-12-months'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'cn/format-patch-quiet'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'ef/maint-strbuf-init'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'rr/doc-content-type'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'jc/merge-dash-previous'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'jk/maint-upload-pack-shallow'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'jk/maint-stash-oob'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'jc/pack-objects-bigfile'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'mh/git-svn-automkdirs'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'mg/reflog-with-options'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'ar/clean-rmdir-empty'	blob \| diff \| raw \| diff to current
2011-04-27	Merge branch 'mg/sha1-path-advise'	blob \| diff \| raw \| diff to current
2011-04-19	Sync with 1.7.4.5	blob \| diff \| raw \| diff to current
2011-04-15	Merge v1.7.5-rc2 into jn/format-patch-doc	blob \| diff \| raw \| diff to current
2011-04-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-04-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-04-13	Merge branch 'jc/rev-list-options-fix' into maint	blob \| diff \| raw \| diff to current
2011-04-13	Merge branch 'js/checkout-untracked-symlink' into maint	blob \| diff \| raw \| diff to current
2011-04-12	i18n: mark merge CHERRY_PICK_HEAD messages for translation	blob \| diff \| raw \| diff to current
2011-04-12	i18n: mark merge "upstream" messages for translation	blob \| diff \| raw \| diff to current
2011-04-12	i18n: mark merge "Could not read from" message for...	blob \| diff \| raw \| diff to current
2011-04-12	Merge branch 'js/checkout-untracked-symlink'	blob \| diff \| raw \| diff to current
2011-04-12	Merge branch 'nd/init-gitdir'	blob \| diff \| raw \| diff to current
2011-04-11	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2011-04-07	merge: allow "-" as a short-hand for "previous branch"	blob \| diff \| raw \| diff to current
2011-04-06	Sync with 1.7.4.4	blob \| diff \| raw \| diff to current
2011-04-06	Merge branch 'mg/rev-list-n-reverse-doc' into maint	blob \| diff \| raw \| diff to current
2011-04-06	Merge branch 'jk/maint-remote-mirror-safer'	blob \| diff \| raw \| diff to current
2011-04-06	Merge branch 'mg/doc-revisions-txt'	blob \| diff \| raw \| diff to current
2011-04-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-04-04	Merge branch 'jl/submodule-fetch-on-demand'	blob \| diff \| raw \| diff to current
2011-04-04	Merge branch 'jc/rev-list-options-fix'	blob \| diff \| raw \| diff to current
2011-04-04	Merge branch 'nm/maint-conflicted-submodule-entries'	blob \| diff \| raw \| diff to current
2011-04-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-04-03	Merge branch 'jc/index-update-if-able' into maint	blob \| diff \| raw \| diff to current
2011-04-03	Merge branch 'lt/default-abbrev' into maint	blob \| diff \| raw \| diff to current
2011-04-03	Merge branch 'jc/maint-rev-list-culled-boundary' into...	blob \| diff \| raw \| diff to current
2011-04-03	Merge branch 'mm/maint-log-n-with-diff-filtering' into...	blob \| diff \| raw \| diff to current
2011-04-03	Merge branch 'jk/format-patch-multiline-header' into...	blob \| diff \| raw \| diff to current
2011-04-03	Merge branch 'jn/maint-instaweb-plack-fix' into maint	blob \| diff \| raw \| diff to current
2011-04-03	Merge branch 'lp/config-vername-check' into maint	blob \| diff \| raw \| diff to current
2011-04-03	Sync with 1.7.4.3	blob \| diff \| raw \| diff to current
2011-04-02	Merge branch 'nd/init-gitdir'	blob \| diff \| raw \| diff to current
2011-04-02	Merge branch 'jc/merge-sans-branch'	blob \| diff \| raw \| diff to current
2011-04-02	Merge branch 'jr/grep-en-config'	blob \| diff \| raw \| diff to current
2011-04-02	Merge branch 'ab/i18n-st'	blob \| diff \| raw \| diff to current
2011-04-02	Merge branch 'jk/pull-into-empty'	blob \| diff \| raw \| diff to current
2011-04-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-04-01	Merge branch 'nd/index-doc' into maint	blob \| diff \| raw \| diff to current
2011-04-01	Merge branch 'pk/stash-apply-status-relative' into...	blob \| diff \| raw \| diff to current
2011-04-01	Merge branch 'jc/maint-diff-q-filter' into maint	blob \| diff \| raw \| diff to current
2011-04-01	Merge branch 'js/maint-stash-index-copy' into maint	blob \| diff \| raw \| diff to current
2011-04-01	Merge branch 'mg/doc-bisect-tweak-worktree' into maint	blob \| diff \| raw \| diff to current
next