Code

modify/delete conflict resolution overwrites untracked file
[git.git] / daemon.c
2008-11-02 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-09-06 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-08-30 Junio C HamanoMerge branch 'sp/missing-thin-base' into maint
2008-08-17 Junio C HamanoMerge git-gui 0.11.0
2008-08-17 Junio C HamanoMerge branch 'ak/p4'
2008-08-17 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14 Junio C HamanoMerge branch 'maint'
2008-08-13 Junio C HamanoMerge branch 'maint'
2008-08-13 Junio C HamanoMerge git://git.bogomips.org/git-svn
2008-08-12 Stephen R. van den... git-daemon: SysV needs the signal handler reinstated.
2008-08-12 Junio C HamanoMerge branch 'maint'
2008-08-11 Junio C HamanoMerge branch 'maint'
2008-08-11 Junio C HamanoMerge branch 'maint'
2008-08-09 Junio C HamanoMerge branch 'maint'
2008-08-07 Junio C HamanoMerge branch 'lt/config-fsync' into maint
2008-08-07 Junio C HamanoMerge branch 'jc/reflog-expire' into maint
2008-08-07 Junio C HamanoMerge branch 'ag/rewrite_one' into maint
2008-08-06 Junio C HamanoSync with 1.5.6.5
2008-08-06 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-08-06 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Junio C HamanoMerge branch 'maint'
2008-08-03 Junio C HamanoMerge branch 'maint'
2008-08-02 Junio C HamanoMerge branch 'maint'
2008-08-02 Junio C HamanoMerge branch 'maint'
2008-07-30 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-27 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-25 Junio C HamanoMerge branch 'maint'
2008-07-24 Junio C HamanoMerge branch 'maint' into ph/checkout
2008-07-23 Johannes Schindelingit daemon: avoid waking up too often
2008-07-21 Junio C HamanoMerge branch 'ap/trackinfo' v1.6.0-rc0
2008-07-21 Junio C HamanoMerge branch 'jc/rerere-auto-more'
2008-07-21 Junio C HamanoMerge branch 'ns/am-abort'
2008-07-21 Junio C HamanoMerge branch 'maint'
2008-07-19 Junio C HamanoMerge branch 'maint'
2008-07-18 Junio C HamanoMerge branch 'sp/maint-index-pack' into maint
2008-07-17 Junio C HamanoMerge branch 'mv/dashless'
2008-07-17 Junio C HamanoMerge branch 'ls/mailinfo'
2008-07-17 Junio C HamanoMerge branch 'sb/dashless'
2008-07-17 Junio C HamanoMerge branch 'sp/maint-index-pack'
2008-07-16 Junio C HamanoMerge branch 'js/maint-pretty-mailmap' into maint
2008-07-16 Junio C HamanoMerge branch 'sp/maint-bash-completion-optim' into...
2008-07-16 Junio C HamanoMerge branch 'sp/maint-pack-memuse' into maint
2008-07-16 Junio C HamanoMerge branch 'ls/maint-mailinfo-patch-label' into maint
2008-07-16 Junio C HamanoMerge branch 'js/maint-daemon-syslog' into maint
2008-07-16 Junio C HamanoMerge branch 'mv/merge-in-c'
2008-07-16 Junio C HamanoMerge branch 'ag/rewrite_one'
2008-07-16 Junio C HamanoMerge branch 'js/maint-pretty-mailmap'
2008-07-15 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-15 Junio C HamanoMerge branch 'ls/maint-mailinfo-patch-label'
2008-07-15 Junio C HamanoMerge branch 'jc/branch-merged'
2008-07-15 Junio C HamanoMerge branch 'jc/rebase-orig-head'
2008-07-15 Junio C HamanoMerge branch 'sp/maint-bash-completion-optim'
2008-07-13 Junio C HamanoMerge branch 'sp/maint-bash-completion-optim'
2008-07-13 Junio C HamanoMerge branch 'maint' to sync with 1.5.6.3
2008-07-13 Junio C HamanoMerge branch 'ph/parseopt-step-blame'
2008-07-13 Junio C HamanoMerge branch 'am/stash-branch'
2008-07-13 Junio C HamanoMerge branch 'sg/stash-k-i'
2008-07-13 Junio C HamanoMerge branch 'jc/report-tracking'
2008-07-13 Junio C HamanoMerge branch 'js/pick-root'
2008-07-13 Junio C HamanoMerge branch 'ab/bundle'
2008-07-13 Junio C HamanoMerge branch 'tr/add-i-e'
2008-07-13 Stephan BeyerMake usage strings dash-less
2008-07-09 Junio C HamanoMerge branch 'jk/pager-config'
2008-07-09 Junio C HamanoMerge branch 'js/apply-root'
2008-07-09 Junio C HamanoMerge branch 'jc/reflog-expire'
2008-07-09 Junio C HamanoMerge branch 'sp/maint-pack-memuse'
2008-07-09 Junio C HamanoMerge branch 'maint'
2008-07-08 Junio C HamanoMerge branch 'jc/blame' (early part) into HEAD
2008-07-08 Junio C HamanoMerge branch 'lt/racy-empty' into maint
2008-07-07 Junio C HamanoMerge branch 'qq/maint'
2008-07-07 Junio C HamanoMerge branch 'js/maint-daemon-syslog'
2008-07-07 Junio C HamanoMerge branch 'dr/ceiling'
2008-07-07 Johannes Schindelingit daemon: avoid calling syslog() from a signal handler
2008-07-06 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-06-27 Junio C HamanoMerge branch 'maint-1.5.5' into maint
2008-06-25 Junio C HamanoMerge branch 'jc/maint-combine-diff-pre-context' into...
2008-06-22 Junio C HamanoMerge branch 'lt/racy-empty'
2008-06-22 Junio C HamanoMerge branch 'jc/maint-combine-diff-pre-context'
2008-06-17 Junio C HamanoMerge branch 'maint'
2008-06-16 Junio C HamanoMerge branch 'maint'
2008-06-11 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-06-11 Junio C HamanoMerge branch 'maint'
2008-06-09 Junio C HamanoMerge branch 'js/merge-recursive'
2008-06-09 Junio C HamanoMerge branch 'maint'
2008-06-07 Junio C HamanoMerge 1.5.5.4 in
2008-06-06 Junio C HamanoMerge branch 'maint'
2008-06-04 Junio C HamanoMerge branch 'maint'
2008-05-28 Junio C HamanoMerge 1.5.5.3 in
2008-05-27 Junio C HamanoMerge branch 'jc/diff-no-no-index'
2008-05-27 Junio C HamanoMerge branch 'maint'
2008-05-27 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-05-26 Junio C HamanoMerge branch 'maint'
2008-05-25 Junio C HamanoMerge branch 'js/config-cb' v1.5.6-rc0
2008-05-24 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-15 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-05-15 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-14 Johannes SchindelinProvide git_config with a callback-data parameter
2008-04-09 Junio C HamanoMerge branch 'jc/rename'
2008-04-08 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-05 Junio C HamanoMerge git://repo.or.cz/git-gui
next