merge-recursive: mark rename/delete conflict as unmerged
[gitweb.git] / Documentation / git-cvsserver.txt
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-20 GIT 1.6.0.6 v1.6.0.6
2008-12-18 Merge git://repo.or.cz/git-gui
2008-12-17 GIT 1.5.6.6 v1.5.6.6
2008-12-17 GIT 1.5.5.6 v1.5.5.6
2008-12-02 Merge git://repo.or.cz/git-gui
2008-12-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://repo.or.cz/git-gui
2008-11-16 Merge git://repo.or.cz/git-gui
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-02 Merge git://repo.or.cz/git-gui
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-10-09 Merge branch 'lt/time-reject-fractional-seconds'
2008-09-25 Merge git://repo.or.cz/git-gui
2008-09-19 Merge branch 'tr/rev-list-reverse'
2008-09-08 Merge branch 'jc/cc-ld-dynpath'
2008-09-07 Merge updated git-gui and gitk that call each other
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-09-03 Merge branch 'tr/filter-branch'
2008-08-30 Merge branch 'sp/missing-thin-base' into maint
2008-08-30 Merge branch 'sb/daemon'
2008-08-28 Merge branch 'mv/merge-custom'
2008-08-27 Merge branch 'am/cherry-pick-rerere'
2008-08-27 Merge branch 'jc/add-addremove'
2008-08-21 Merge branch 'ml/submodule-foreach'
2008-08-21 Merge branch 'pm/log-exit-code'
2008-08-21 Merge branch 'sb/commit-tree-minileak'
2008-08-21 Merge branch 'pb/reflog-dwim'
2008-08-21 Merge branch 'jc/add-stop-at-symlink'
2008-08-21 Merge branch 'kh/diff-tree'
2008-08-21 Merge branch 'mg/count-objects'
2008-08-21 Merge branch 'mz/push-verbose'
2008-08-21 Merge branch 'jc/index-extended-flags'
2008-08-21 Merge branch 'cc/merge-base-many'
2008-08-21 Merge branch 'jc/test-deeper'
2008-08-21 Merge branch 'js/parallel-test'
2008-08-20 Merge branch 'bd/diff-strbuf'
2008-08-20 Merge branch 'dp/hash-literally'
2008-08-20 Merge branch 'js/checkout-dwim-local'
2008-08-20 Merge branch 'ph/enable-threaded'
2008-08-20 Merge branch 'jk/pager-swap'
2008-08-20 Merge branch 'rs/imap'
2008-08-20 Merge branch 'js/mingw-stat'
2008-08-19 Merge branch 'maint'
2008-08-19 adapt git-cvsserver manpage to dash-free syntax
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14 Merge branch 'maint'
2008-08-13 Merge branch 'maint'
2008-08-12 Merge branch 'maint'
2008-08-11 Merge branch 'maint'
2008-08-11 Merge branch 'maint'
2008-08-09 Merge branch 'maint'
2008-08-07 Merge branch 'lt/config-fsync' into maint
2008-08-07 Merge branch 'jc/reflog-expire' into maint
2008-08-06 Sync with 1.5.6.5
2008-08-06 Merge git://repo.or.cz/git-gui
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Merge branch 'maint'
2008-08-03 Merge branch 'maint'
2008-08-02 Merge branch 'maint'
2008-08-02 Merge branch 'maint'
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-25 Merge branch 'maint'
2008-07-24 Merge branch 'maint' into ph/checkout
2008-07-21 Merge branch 'maint'
2008-07-19 Merge branch 'maint'
2008-07-17 Merge branch 'sp/maint-index-pack'
2008-07-17 Merge branch 'maint'
2008-07-16 Merge branch 'js/maint-daemon-syslog' into maint
2008-07-16 Merge branch 'mv/merge-in-c'
2008-07-16 Merge branch 'ag/rewrite_one'
2008-07-16 Merge branch 'js/maint-pretty-mailmap'
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-15 Merge branch 'ls/maint-mailinfo-patch-label'
2008-07-15 Merge branch 'jc/branch-merged'
2008-07-15 Merge branch 'sp/maint-bash-completion-optim'
2008-07-13 Merge branch 'sp/maint-bash-completion-optim'
2008-07-13 Merge branch 'maint' to sync with 1.5.6.3
2008-07-13 Merge branch 'ph/parseopt-step-blame'
2008-07-13 Merge branch 'am/stash-branch'
2008-07-13 Merge branch 'sg/stash-k-i'
2008-07-13 Merge branch 'jc/report-tracking'
2008-07-13 Merge branch 'tr/add-i-e'
2008-07-09 Merge branch 'js/apply-root'
2008-07-09 Merge branch 'jc/reflog-expire'
2008-07-09 Merge branch 'sp/maint-pack-memuse'
2008-07-09 Merge branch 'maint'
2008-07-08 Merge branch 'jc/blame' (early part) into HEAD
2008-07-08 Merge branch 'lt/racy-empty' into maint
2008-07-07 Merge branch 'qq/maint'
2008-07-07 Merge branch 'js/maint-daemon-syslog'
2008-07-07 Merge branch 'maint'
2008-07-07 Merge branch 'qq/maint' (early part) into maint
2008-07-07 Merge branch 'jc/rerere'
2008-07-07 Merge branch 'dr/ceiling'
next