xdl_merge(): fix and simplify conflict handling
[git] / builtin-branch.c
2006-12-03  Junio C HamanoMerge branch 'maint'
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk
2006-11-29  Junio C HamanoMerge branch 'maint'
2006-11-29  Junio C HamanoMerge branch 'maint'
2006-11-27  Junio C HamanoMerge branch 'js/shortlog'
2006-11-27  Junio C HamanoMerge branch 'jc/push-delete-ref'
2006-11-27  Junio C HamanoMerge branch 'jc/merge'
2006-11-27  Junio C HamanoMerge branch 'jc/pack-peeled'
2006-11-25  Junio C HamanoMerge branch 'master' into jc/globfetch
2006-11-25  Junio C Hamanogit-branch -D: make it work even when on a yet-to-be...
2006-11-25  Lars HjemliAdd -v and --abbrev options to git-branch
2006-11-24  Junio C HamanoMerge branch 'jn/web'
2006-11-24  Junio C HamanoMerge branch 'pb/diffroot'
2006-11-24  Junio C HamanoMerge branch 'jc/pack-heuristics'
2006-11-24  Junio C HamanoMerge branch 'jc/numstat'
2006-11-24  Junio C HamanoMerge branch 'ap/branch-ref-display'
2006-11-24  Junio C HamanoMerge branch 'jc/upload-pack'
2006-11-22  Andy ParkinsAdd support to git-branch to show local and remote...
2006-11-13  Junio C HamanoMerge branch 'maint'
2006-11-12  Junio C HamanoMerge branch 'maint'
2006-11-11  Junio C HamanoMerge branch 'maint'
2006-11-09  Junio C HamanoMerge branch 'maint'
2006-11-09  Junio C HamanoMerge branch 'maint'
2006-11-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-11-08  Junio C HamanoMerge branch 'maint'
2006-11-08  Junio C HamanoMerge branch 'jc/pickaxe'
2006-11-07  Junio C HamanoMerge branch 'jc/read-tree'
2006-11-07  Junio C HamanoMerge branch 'maint'
2006-11-05  Junio C HamanoMerge branch 'maint'
2006-11-05  Junio C HamanoMerge branch 'np/verbose-push'
2006-11-05  Junio C HamanoMerge branch 'lt/push-config'
2006-11-05  Junio C HamanoMerge branch 'pb/web'
2006-11-04  Junio C HamanoMerge branch 'maint'
2006-11-03  Junio C HamanoMerge branch 'master' into np/index-pack
2006-11-03  Junio C HamanoMerge branch 'maint'
2006-11-03  Andy ParkinsRemove uneccessarily similar printf() from print_ref_li...
2006-11-01  Junio C HamanoMerge branch 'maint'
2006-11-01  Junio C HamanoMerge branch 'rs/cherry'
2006-11-01  Junio C HamanoMerge branch 'jc/refs-and-fetch'
2006-11-01  Junio C HamanoMerge branch 'lj/refs'
2006-10-27  Junio C HamanoMerge branch 'jc/reflog' into lj/refs
2006-10-24  Lars HjemliMake git-branch a builtin