Code

refuse to merge during a merge
[git.git] / decorate.c
2009-05-26 Junio C HamanoMerge branch 'js/maint-no-ln-across-libexec-and-bin...
2009-05-26 Junio C HamanoMerge branch 'lt/maint-diff-reduce-lstat' into maint
2009-05-26 Junio C HamanoMerge branch 'jm/format-patch-no-auto-n-when-k-is-given...
2009-05-26 Junio C HamanoMerge branch 'do/maint-merge-recursive-fix' into maint
2009-05-26 Junio C HamanoMerge branch 'jk/maint-1.6.0-trace-argv' into maint
2009-05-26 Junio C HamanoMerge branch 'np/push-delta' into maint
2009-05-26 Junio C HamanoMerge branch 'ar/merge-one-file-diag' into maint
2009-05-26 Junio C HamanoMerge branch 'ar/unlink-err' into maint
2009-05-26 Junio C HamanoMerge branch 'jk/maint-add-empty' into maint
2009-05-24 Junio C HamanoMerge branch 'maint-1.6.2' into maint
2009-05-17 Dan McGeeFix type-punning issues
2009-05-03 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-05-02 Junio C HamanoMerge git://repo.or.cz/git-gui
2009-05-01 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-09 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-04-09 Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
2009-04-02 Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s' into maint
2009-03-28 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully'
2009-03-26 Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s'
2009-03-22 Junio C HamanoMerge branch 'jc/maint-1.6.0-read-tree-overlay' into...
2009-03-18 Junio C HamanoMerge branch 'jc/maint-1.6.0-read-tree-overlay'
2009-03-02 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-02-11 Junio C HamanoMerge branch 'maint-1.5.6' into maint
2009-01-24 Junio C HamanoMerge branch 'cb/maint-unpack-trees-absense' into maint
2009-01-14 Junio C HamanoMerge branch 'cb/maint-unpack-trees-absense'
2009-01-13 Junio C HamanoMerge branch 'ap/maint-apply-modefix' into maint
2009-01-07 Junio C HamanoMerge branch 'maint-1.5.6' into maint-1.6.0
2009-01-03 Junio C HamanoMerge branch 'ap/maint-apply-modefix'
2008-12-27 Junio C HamanoMerge branch 'sp/maint-describe-all-tag-warning' into...
2008-12-22 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-20 Junio C HamanoGIT 1.6.0.6 v1.6.0.6
2008-12-18 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-02 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-02 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-16 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-13 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-02 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-02 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-21 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-10-09 Shawn O. PearceMerge branch 'lt/time-reject-fractional-seconds'
2008-09-25 Shawn O. PearceMerge git://repo.or.cz/git-gui
2008-09-19 Junio C HamanoMerge branch 'tr/rev-list-reverse'
2008-09-08 Junio C HamanoMerge branch 'jc/cc-ld-dynpath'
2008-09-07 Junio C HamanoMerge updated git-gui and gitk that call each other
2008-09-06 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-09-03 Junio C HamanoMerge branch 'tr/filter-branch'
2008-08-30 Junio C HamanoMerge branch 'sp/missing-thin-base' into maint
2008-08-30 Junio C HamanoMerge branch 'sb/daemon'
2008-08-28 Junio C HamanoMerge branch 'mv/merge-custom'
2008-08-27 Junio C HamanoMerge branch 'am/cherry-pick-rerere'
2008-08-27 Junio C HamanoMerge branch 'jc/add-addremove'
2008-08-27 Junio C HamanoMerge branch 'jc/no-slim-shell'
2008-08-24 Junio C HamanoMerge branch 'jc/no-slim-shell'
2008-08-21 Junio C HamanoMerge branch 'ml/submodule-foreach'
2008-08-21 Junio C HamanoMerge branch 'pm/log-exit-code'
2008-08-21 Junio C HamanoMerge branch 'sb/commit-tree-minileak'
2008-08-21 Junio C HamanoMerge branch 'pb/reflog-dwim'
2008-08-21 Junio C HamanoMerge branch 'jc/add-stop-at-symlink'
2008-08-21 Junio C HamanoMerge branch 'kh/diff-tree'
2008-08-21 Junio C HamanoMerge branch 'mg/count-objects'
2008-08-21 Junio C HamanoMerge branch 'mz/push-verbose'
2008-08-21 Junio C HamanoMerge branch 'jc/index-extended-flags'
2008-08-21 Junio C HamanoMerge branch 'cc/merge-base-many'
2008-08-21 Junio C HamanoMerge branch 'jc/test-deeper'
2008-08-21 Junio C HamanoMerge branch 'js/parallel-test'
2008-08-20 Junio C HamanoMerge branch 'maint'
2008-08-20 Jeff Kingdecorate: allow const objects to be decorated
2008-08-17 Junio C HamanoMerge git-gui 0.11.0
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-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-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-21 Junio C HamanoMerge branch 'maint'
2008-07-19 Junio C HamanoMerge branch 'maint'
2008-07-17 Junio C HamanoMerge branch 'sp/maint-index-pack'
2008-07-17 Junio C HamanoMerge branch '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 'sp/maint-bash-completion-optim'
next