merge: loosen overcautious "working file will be lost" check.
[gitweb.git] / merge-base.c
2006-10-17 Merge branch 'maint'
2006-10-02 Merge branch 'maint'
2006-10-01 Merge branch 'maint'
2006-10-01 Merge branch 'jc/gitpm'
2006-09-18 Merge part of branch 'jc/upload-pack'
2006-09-14 Merge branches 'maint' and 'jc/http'
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-28 Merge branch 'js/c-merge-recursive'
2006-08-23 Merge branch 'gl/cleanup' into gl/cleanup-next
2006-08-21 Merge branch 'maint'
2006-08-17 Merge branch 'jc/format-patch'
2006-08-16 Merge branch 'jc/racy'
2006-08-16 Merge branch 'maint'
2006-08-16 remove unnecessary initializations
2006-08-13 Merge branch 'th/diff-extra'
2006-08-13 GIT 1.4.2 v1.4.2
2006-08-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-08 Merge branch 'master' into pb/gitpm
2006-07-30 Merge branch 'jn/make'
2006-07-26 Merge branch 'pb/configure'
2006-07-13 Merge branch 'lt/merge-tree'
2006-07-10 Merge branch 'jc/rename'
2006-07-10 Merge branch 'jc/grep'
2006-07-10 Merge branch 'jc/mailinfo'
2006-07-10 Merge branch 'ew/svn'
2006-07-07 Merge branch 'js/merge-base'
2006-07-03 Merge branch 'master' into js/merge-base
2006-07-02 Fold get_merge_bases_clean() into get_merge_bases()
2006-06-29 move get_merge_bases() to core lib.
2006-06-29 refactor merge_bases() as preparation to libify merge...
2006-06-18 Merge branch 'jc/rw-prefix'
2006-06-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10 Merge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04 Merge branch 'new' of git://git./gitk/gitk into next
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-29 Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache...
2006-05-28 Merge branch 'jc/cache-tree' into next
2006-05-21 Merge branch 'master' into js/fmt-patch
2006-05-20 Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache...
2006-05-20 Merge branch 'js/fetchconfig'
2006-05-19 Merge branch 'jc/apply'
2006-05-19 Merge part of 'js/fmt-patch' for RFC2822 dates into...
2006-05-17 Merge branch 'jc/apply' into next
2006-05-17 Merge branch 'jc/apply'
2006-05-17 Merge branch 'jc/gitlink' into next
2006-05-17 Merge branch 'master' into next
2006-05-17 Merge branch 'maint'
2006-05-17 merge-base: Clarify the comments on post processing.
2006-05-16 Merge branch 'jc/grep'
2006-05-15 Merge branch 'jc/grep' into next
2006-05-15 Merge branch 'jc/grep' into next
2006-05-10 Merge branch 'jc/grep' into next
2006-05-09 Merge branch 'mw/alternates'
2006-05-09 Merge branch 'jc/xsha1'
2006-05-09 Merge branch 'jc/again'
2006-05-09 Merge branch 'np/delta'
2006-05-09 Merge branch 'jc/bindiff'
2006-05-09 Merge branch 'jc/grep' into next
2006-05-09 Merge branch 'tojunio' of locke.catalyst.net.nz/git...
2006-05-08 Merge branch 'jc/clean' into next
2006-05-08 Merge branch 'fix'
2006-05-08 Separate object name errors from usage errors
2006-05-03 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07 Merge branch 'maint'
2006-04-05 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-05 Merge branch 'fix'
2006-04-04 Merge branch 'lt/fix-sol-pack'
2006-04-04 Merge branch 'lt/fix-sol-pack' into next
2006-04-02 Merge branch 'lt/fix-sol-pack' into next
2006-03-31 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-28 Merge branch ak/svn
2006-03-27 Merge branch 'lt/diffgen' into next
2006-03-26 Merge branches 'jc/clone' and 'jc/name'
2006-03-26 Merge branch 'lt/diffgen' into next
2006-03-26 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-26 Merge branch 'ew/email' into next
2006-03-26 Merge branch 'lt/diffgen' into next
2006-03-26 Merge branch 'rs/tar-tree' into next
2006-03-24 Merge branch 'jc/name' into next
2006-03-24 sha1_name: warning ambiguous refs.
2006-02-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-12-04 GIT 0.99.9l aka 1.0rc4 v0.99.9lv1.0rc4
2005-11-30 Merge branch 'jc/subdir'
2005-11-29 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-29 Make the rest of commands work from a subdirectory.
2005-11-28 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-22 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-12 GIT 0.99.9h v0.99.9hv1.0rc1
2005-11-11 Merge branches 'jc/sb' and 'jc/mb'
2005-11-11 merge-base: avoid unnecessary postprocessing.
2005-11-11 merge-base: fully contaminate the well.
next