t6023: merge-file fails to output anything for a degenerate merge
[gitweb.git] / builtin-branch.c
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0
2008-12-20 GIT 1.6.0.6 v1.6.0.6
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-01 Merge branch 'st/maint-tag' into maint
2008-11-09 Merge branch 'cb/maint-update-ref-fix' into maint
2008-11-09 Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint
2008-11-09 Merge branch 'ar/maint-mksnpath' into maint
2008-11-09 Merge branch 'mv/maint-branch-m-symref' into maint
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-26 Fix git branch -m for symrefs.
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
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-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 builtin-branch: fix -v for --[no-]merged
2008-07-27 builtin-branch: factor out merge_filter matching
2008-07-27 builtin-branch: remove duplicated code
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-23 builtin-branch.c: optimize --merged and --no-merged
2008-07-23 builtin-branch.c: remove unused code in append_ref...
2008-07-21 Merge branch 'ap/trackinfo' v1.6.0-rc0
2008-07-21 Merge branch 'jc/rerere-auto-more'
2008-07-21 Merge branch 'ns/am-abort'
2008-07-21 Merge branch 'maint'
2008-07-19 Merge branch 'maint'
2008-07-17 Merge branch 'mv/dashless'
2008-07-17 Merge branch 'ls/mailinfo'
2008-07-17 Merge branch 'sb/dashless'
2008-07-17 Merge branch 'rs/archive'
2008-07-17 Merge branch 'rs/rebase-checkout-not-so-quiet'
2008-07-17 Merge branch 'sp/maint-index-pack'
2008-07-17 Merge branch 'maint'
2008-07-16 Merge branch 'mv/merge-in-c'
2008-07-16 Merge branch 'ag/rewrite_one'
2008-07-16 Merge branch 'sp/win'
2008-07-16 Merge branch 'js/more-win'
2008-07-16 Merge branch 'js/maint-pretty-mailmap'
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-15 Merge branch 'js/merge-rr'
2008-07-15 Merge branch 'sb/rerere-lib'
2008-07-15 Merge branch 'ls/maint-mailinfo-patch-label'
2008-07-15 Merge branch 'om/rerere-careful'
2008-07-15 Merge branch 'jc/branch-merged'
2008-07-15 Merge branch 'jc/rebase-orig-head'
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 Make usage strings dash-less
2008-07-09 branch --merged/--no-merged: allow specifying arbitrary...
2008-07-09 branch --contains: default to HEAD
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 'dr/ceiling'
2008-07-06 Merge git://repo.or.cz/git-gui
2008-07-06 branch -r -v: do not spit out garbage
2008-07-03 git-branch -v: show the remote tracking statistics
2008-06-27 Merge branch 'maint-1.5.5' into maint
2008-06-27 Merge branch 'maint-1.5.4' into maint-1.5.5
2008-06-25 Merge branch 'jc/maint-combine-diff-pre-context' into...
2008-06-22 Merge branch 'lt/racy-empty'
2008-06-22 Merge branch 'jc/maint-combine-diff-pre-context'
2008-06-17 Merge branch 'maint'
2008-06-16 Merge branch 'maint'
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-06-11 Merge branch 'maint'
2008-06-09 Merge branch 'js/merge-recursive'
2008-06-09 Merge branch 'maint'
2008-06-07 Merge 1.5.5.4 in
2008-06-06 Merge branch 'maint'
2008-06-04 Merge branch 'maint'
2008-05-28 Merge 1.5.5.3 in
2008-05-27 Merge branch 'jc/diff-no-no-index'
2008-05-27 Merge branch 'maint'
2008-05-27 Merge git://repo.or.cz/git-gui
2008-05-26 Merge branch 'maint'
2008-05-26 Merge branch 'maint-1.5.4' into maint
2008-05-25 Merge branch 'js/config-cb' v1.5.6-rc0
2008-05-25 Merge branch 'db/clone-in-c'
2008-05-25 Merge branch 'ar/batch-cat'
2008-05-25 Merge branch 'ap/svn'
next