Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.c

2011-05-15	Merge branch 'cn/format-patch-quiet' into maint	blob \| diff \| raw
2011-05-15	Merge branch 'jm/mergetool-submodules' into maint	blob \| diff \| raw
2011-05-15	Merge branch 'jk/format-patch-quote-special-in-from...	blob \| diff \| raw
2011-05-15	Merge branch 'vh/git-svn-doc' into maint	blob \| diff \| raw
2011-05-15	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-05-15	add, merge, diff: do not use strcasecmp to compare...	blob \| diff \| raw
2011-05-13	Merge branch 'bf/commit-template-no-cleanup'	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'jc/t1506-shell-param-expansion-gotcha'	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'rr/rerere-libify-clear-gc'	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'jh/dirstat-lines'	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'jc/fix-add-u-unmerged'	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'jn/setup-revisions-glob-and-friends-passthru'	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'cn/log-parse-opt'	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'aw/maint-rebase-i-p-no-ff' into maint	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'gr/cvsimport-alternative-cvspass-location...	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'jk/merge-one-file-working-tree' into...	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'jc/fix-diff-files-unmerged' into maint	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'mz/maint-rename-unmerged' into maint	blob \| diff \| raw \| diff to current
2011-05-13	Merge branch 'nd/struct-pathspec'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'jn/gitweb-dependency'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'jc/maint-branch-mergeoptions'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'jn/maint-test-merge-verify-parents'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'vh/config-interactive-singlekey-doc'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'jc/maint-add-p-overlapping-hunks'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'sr/maint-fast-import-tighten-option-parsing'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'dm/http-cleanup'	blob \| diff \| raw \| diff to current
2011-05-11	Merge branch 'jn/ctags'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'jc/maint-branch-mergeoptions' into mg...	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'jn/run-command-error-failure'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'js/info-man-path'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'im/hashcmp-optim'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'jk/merge-one-file-working-tree'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'jc/fix-diff-files-unmerged'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'cj/p4merge'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'gr/cvsimport-alternative-cvspass-location'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'sg/completion-cleanup'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'js/blame-parsename'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'jk/format-patch-quote-special-in-from'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'nd/struct-pathspec'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'aw/maint-rebase-i-p-no-ff'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'mg/alias-expose-prefix'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'mg/diff-uiconfig-doc'	blob \| diff \| raw \| diff to current
2011-05-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-05-05	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2011-05-05	Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'ml/test-readme'	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'ft/gitweb-tar-with-gzip-n'	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'mg/rev-list-count-cherry'	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'ss/doc-svn'	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'jn/format-patch-doc'	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'vr/merge-base-doc'	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'ss/cherry-pick-x-doc'	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'jn/maint-format-patch-doc'	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'jk/format-patch-multiline-header'	blob \| diff \| raw \| diff to current
2011-05-04	Merge branch 'jm/mergetool-submodules'	blob \| diff \| raw \| diff to current
2011-05-04	Sync with 1.7.5.1	blob \| diff \| raw \| diff to current
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 \| diff to current
2011-05-02	Merge branch 'ab/i18n-fixup'	blob \| diff \| raw \| diff to current
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 '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 '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-25	Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...	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
next