t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch
[gitweb.git] / xdiff /
2007-03-05 Merge branch 'js/fetch-progress' (early part)
2007-03-05 Merge branch 'maint'
2007-03-04 Merge branch 'maint'
2007-03-03 Merge branch 'maint'
2007-03-02 Merge branch 'js/commit-format'
2007-03-02 Merge branch 'maint'
2007-02-28 Merge branch 'js/bundle'
2007-02-28 Merge branch 'maint'
2007-02-28 Merge branch 'mc/sendmail'
2007-02-28 Merge branch 'maint'
2007-02-27 Merge branch 'maint'
2007-02-26 Merge branch 'maint'
2007-02-26 Merge branch 'maint'
2007-02-25 Merge branch 'maint'
2007-02-25 Merge git://repo.or.cz/git-gui into maint
2007-02-24 Evil Merge branch 'jc/status' (early part) into js...
2007-02-24 Merge branch 'js/apply'
2007-02-24 Merge branch 'js/no-limit-boundary'
2007-02-24 Merge branch 'js/etc-config'
2007-02-24 Merge branch 'maint'
2007-02-23 Merge branches 'lt/crlf' and 'jc/apply-config'
2007-02-23 Merge branch 'maint'
2007-02-21 Merge branch 'maint'
2007-02-21 Merge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-21 Merge branch 'fk/autoconf'
2007-02-21 Merge branch 'js/name-rev-fix'
2007-02-21 Merge branch 'maint'
2007-02-20 Merge branch 'js/diff-color-check'
2007-02-20 Merge branch 'jc/fetch-notags'
2007-02-20 Merge branch 'maint'
2007-02-19 Merge branch 'ap/cvsserver'
2007-02-19 Merge branch 'maint'
2007-02-18 Merge branch 'maint'
2007-02-18 Merge git://git./pub/scm/gitk/gitk into maint
2007-02-16 Merge branch 'maint'
2007-02-16 Merge branch 'maint'
2007-02-14 Merge branch 'maint'
2007-02-14 Merge branch 'maint'
2007-02-14 teach diff machinery about --ignore-space-at-eol
2007-02-14 Merge branch 'jc/diff-apply-patch'
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-02-12 Merge git-gui
2007-01-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-14 Merge branch 'master' into sp/fast-import
2007-01-09 Merge branch 'maint'
2007-01-05 Merge branch 'maint'
2007-01-01 Merge branch 'sp/merge' (early part)
2006-12-31 Merge branch 'jc/send-pack-pipeline'
2006-12-31 Merge branch 'master' into sp/mmap
2006-12-31 Fix yet another subtle xdl_merge() bug
2006-12-29 Merge branch 'jc/curl'
2006-12-29 Merge branch 'jc/utf8'
2006-12-29 Merge branch 'jc/make'
2006-12-28 xdl_merge(): fix a segmentation fault when refining...
2006-12-27 Merge branch 'master' into js/shallow
2006-12-22 Merge branch 'maint'
2006-12-20 Merge branch 'maint'
2006-12-18 Merge branch 'jn/web' (early part)
2006-12-14 Merge branch 'maint'
2006-12-14 Merge branch 'jc/diff--cached'
2006-12-13 Merge branch 'jc/read-tree-ignore'
2006-12-13 Merge branch 'ew/rerere'
2006-12-13 Merge branch 'np/addcommit'
2006-12-13 Merge branch 'lh/branch-rename'
2006-12-13 Merge branch 'jc/commit-careful'
2006-12-13 Merge branch 'ap/clone-origin'
2006-12-13 Merge branch 'jc/numstat'
2006-12-13 Merge branch 'rr/cvsexportcommit'
2006-12-13 Merge branch 'ap/branch'
2006-12-13 Merge branch 'js/merge'
2006-12-13 Merge branch 'maint'
2006-12-13 Merge branch 'master' into js/merge
2006-12-13 Merge branch 'maint'
2006-12-11 Merge branch 'maint'
2006-12-07 Merge branch 'maint'
2006-12-06 Merge
2006-12-06 Merge branch 'maint'
2006-12-05 xdl_merge(): fix and simplify conflict handling
2006-12-05 diff -b: ignore whitespace at end of line
2006-12-03 xdl_merge(): fix thinko
2006-12-03 xdl_merge(): fix an off-by-one bug
2006-12-03 xmerge: make return value from xdl_merge() more usable.
2006-12-03 xdiff: add xdl_merge()
2006-11-29 Merge master.kernel.org:/pub/scm/gitk/gitk
2006-11-27 Merge branch 'js/shortlog'
2006-11-27 Merge branch 'jc/merge'
2006-11-27 Merge branch 'jc/pack-peeled'
2006-11-25 Merge branch 'master' into jc/globfetch
2006-11-24 Merge branch 'jn/web'
2006-11-24 Merge branch 'jc/pack-heuristics'
2006-11-24 Merge branch 'jc/numstat'
2006-11-24 Merge branch 'ap/branch-ref-display'
2006-11-24 Merge branch 'ap/prune'
2006-11-24 Merge branch 'jc/upload-pack'
2006-11-24 Increase length of function name buffer
2006-11-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-11-08 Merge branch 'jc/pickaxe'
2006-11-01 Merge branch 'rs/cherry'
2006-11-01 Merge branch 'jc/refs-and-fetch'
next