merge-recursive: Save D/F conflict filenames instead of unlinking them
[gitweb.git] / transport.h
2011-06-01 Merge branch 'jk/maint-config-alias-fix' into maint
2011-06-01 Merge branch 'kk/maint-prefix-in-config-mak' into maint
2011-05-31 Merge branch 'jc/rename-degrade-cc-to-c' into maint
2011-05-31 Merge branch 'rr/doc-content-type' into maint
2011-05-30 Merge branch 'jm/maint-misc-fix' into maint
2011-05-26 Merge branch 'maint-1.7.4' into maint
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26 Merge branch 'jm/maint-diff-words-with-sbe' into maint
2011-05-26 Merge branch 'kk/maint-prefix-in-config-mak' into maint
2011-05-26 Merge branch 'ss/doc-svn' into maint
2011-05-26 Merge branch 'rg/copy-gecos-username' into maint
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26 Merge branch 'svn-fe-maint' of git://repo.or.cz/git...
2011-05-17 Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-05-16 Merge branch 'jn/maint-format-patch-doc' into maint
2011-05-16 Merge branch 'ss/cherry-pick-x-doc' into maint
2011-05-16 Merge branch 'vr/merge-base-doc' into maint
2011-05-16 Merge branch 'jc/t1506-shell-param-expansion-gotcha...
2011-05-16 Merge branch 'jc/fix-add-u-unmerged' into maint
2011-05-16 Merge branch 'jc/maint-branch-mergeoptions' into maint
2011-05-16 Merge branch 'jc/maint-add-p-overlapping-hunks' into...
2011-05-15 Merge branch 'jk/format-patch-quote-special-in-from...
2011-05-13 Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
2011-05-13 Merge branch 'gr/cvsimport-alternative-cvspass-location...
2011-05-13 Merge branch 'jk/merge-one-file-working-tree' into...
2011-05-13 Merge branch 'jc/fix-diff-files-unmerged' into maint
2011-05-13 Merge branch 'mz/maint-rename-unmerged' into maint
2011-05-11 Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
2011-05-11 Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-05 Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-05-04 Merge branch 'jh/dirstat' into maint
2011-05-04 Merge branch 'sp/maint-clear-postfields' into maint
2011-05-04 Merge branch 'jk/maint-stash-oob' into maint
2011-05-04 Merge branch 'jk/maint-upload-pack-shallow' into maint
2011-05-04 Merge branch 'jc/pack-objects-bigfile' into maint
2011-05-04 Merge branch 'mg/reflog-with-options' into maint
2011-05-04 Merge branch 'ar/clean-rmdir-empty' into maint
2011-05-04 Merge branch 'mg/sha1-path-advise' into maint
2011-04-29 Merge branch 'mg/x-years-12-months' into maint
2011-04-25 Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-04-19 Sync with 1.7.4.5
2011-04-15 Merge v1.7.5-rc2 into jn/format-patch-doc
2011-04-14 Merge branch 'maint'
2011-04-13 Merge branch 'maint'
2011-04-12 Merge branch 'js/checkout-untracked-symlink'
2011-04-12 Merge branch 'nd/init-gitdir'
2011-04-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2011-04-06 Sync with 1.7.4.4
2011-04-06 Merge branch 'jk/maint-remote-mirror-safer'
2011-04-04 Merge branch 'maint'
2011-04-04 Merge branch 'jl/submodule-fetch-on-demand'
2011-04-04 Merge branch 'jc/rev-list-options-fix'
2011-04-04 Merge branch 'nm/maint-conflicted-submodule-entries'
2011-04-03 Merge branch 'maint'
2011-04-03 Merge branch 'jc/index-update-if-able' into maint
2011-04-03 Merge branch 'jc/maint-rev-list-culled-boundary' into...
2011-04-03 Sync with 1.7.4.3
2011-04-02 Merge branch 'nd/init-gitdir'
2011-04-02 Merge branch 'jc/merge-sans-branch'
2011-04-02 Merge branch 'ab/i18n-st'
2011-04-02 Merge branch 'sb/sparse-more'
2011-04-02 Merge branch 'maint'
2011-04-01 Merge branch 'nd/index-doc' into maint
2011-04-01 Merge branch 'jc/maint-diff-q-filter' into maint
2011-04-01 Merge branch 'mg/doc-bisect-tweak-worktree' into maint
2011-04-01 Merge branch 'jh/maint-do-not-track-non-branches' into...
2011-04-01 Merge "checkout ambiguous ref bugfix" into maint
2011-03-31 Merge branch 'maint'
2011-03-30 Merge branch 'maint'
2011-03-30 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
2011-03-29 Merge branch 'maint'
2011-03-29 Merge branch 'jc/fetch-progressive-stride'
2011-03-29 Merge branches 'sp/maint-fetch-pack-stop-early' and...
2011-03-28 Merge branch 'maint'
2011-03-27 Merge branch 'mg/rev-list-n-parents'
2011-03-27 Merge branch 'js/remove-unused-variables'
2011-03-27 Merge branch 'jp/completion-help-alias'
2011-03-27 Merge branch 'jc/index-update-if-able'
2011-03-27 Merge branch 'jk/checkout-orphan-warning'
2011-03-27 Merge branch 'jc/maint-rerere-in-workdir'
2011-03-27 Merge branch 'nd/index-doc'
2011-03-27 Merge branch 'jc/fetch-progressive-stride'
2011-03-26 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
2011-03-26 Merge git-gui 0.14.0
2011-03-26 Sync with 1.7.4.2
2011-03-23 Merge branch 'kc/gitweb-pathinfo-w-anchor'
2011-03-23 Merge branch 'jn/fortify-source-workaround'
2011-03-23 Merge branch 'jn/maint-c99-format'
2011-03-23 Merge branch 'lt/default-abbrev'
2011-03-23 Merge branch 'pk/stash-apply-status-relative'
2011-03-23 Merge branch 'jc/maint-diff-q-filter'
2011-03-23 Merge branch 'pw/p4'
2011-03-23 Merge branch 'mg/rev-list-one-side-only'
2011-03-23 Merge branch 'js/maint-stash-index-copy'
2011-03-23 Merge branch 'tl/p4'
2011-03-23 Merge branch 'mg/doc-bisect-tweak-worktree'
2011-03-23 Merge branch 'jn/test-sanitize-git-env'
2011-03-23 Merge branch 'sp/maint-upload-pack-stop-early'
next