Code

refuse to merge during a merge
[git.git] / dir.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-24 Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-05-24 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-05-17 Linus Torvaldsdir.c: clean up handling of 'path' parameter in read_di...
2009-05-16 Junio C HamanoMerge branch 'maint-1.6.2' into maint
2009-05-14 Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-05-14 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-05-12 Junio C HamanoMerge branch 'maint-1.6.2' into maint
2009-05-12 Junio C HamanoMerge branch 'jc/maint-read-tree-multi' into maint...
2009-05-09 Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-05-09 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-05-06 Junio C HamanoMerge branch 'maint'
2009-05-06 Junio C HamanoMerge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
2009-05-06 Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-05-06 Allan Caffeedir.c: Fix two minor grammatical errors in comments
2009-05-03 Junio C HamanoSync with GIT 1.6.2.5
2009-05-03 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-05-03 Junio C HamanoMerge branch 'lt/pack-object-memuse' into maint
2009-05-03 Junio C HamanoMerge branch 'jc/maint-1.6.0-keep-pack' into maint...
2009-05-03 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-05-03 Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-05-02 Junio C HamanoMerge git://repo.or.cz/git-gui
2009-05-01 Felipe ContrerasFix a bunch of pointer declarations (codestyle)
2009-05-01 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-29 Junio C HamanoMerge branch 'maint'
2009-04-29 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-29 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-28 Junio C HamanoMerge branch 'maint'
2009-04-28 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-28 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-25 Junio C HamanoMerge branch 'maint'
2009-04-25 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-25 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-23 Junio C HamanoMerge branch 'jc/maint-read-tree-multi'
2009-04-21 Junio C HamanoMerge branch 'mk/maint-apply-swap'
2009-04-21 Junio C HamanoMerge branch 'maint'
2009-04-20 Junio C HamanoMerge branch 'mm/maint-add-p-quit'
2009-04-20 Junio C HamanoSync with 1.6.2.4
2009-04-18 Junio C HamanoMerge branch 'lt/pack-object-memuse'
2009-04-18 Junio C HamanoMerge branch 'maint'
2009-04-18 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-18 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-18 Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-04-18 Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-04-18 Junio C HamanoMerge branch 'maint'
2009-04-18 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-18 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-13 Junio C HamanoMark t1301 permission test to depend on POSIXPERM
2009-04-12 Junio C HamanoMerge branch 'maint'
2009-04-12 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-12 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-09 Junio C HamanoMerge branch 'maint'
2009-04-09 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-04-09 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-09 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-09 Junio C HamanoMerge branch 'jc/maint-1.6.0-keep-pack' into maint
2009-04-09 Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
2009-04-09 Junio C HamanoMerge branch 'bc/maint-1.6.1-branch-deleted-was' into...
2009-04-09 Junio C HamanoMerge branch 'js/maint-1.6.0-exec-path-env' into maint...
2009-04-08 Junio C HamanoMerge branch 'maint'
2009-04-08 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-08 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-08 Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix'
2009-04-08 Junio C HamanoMerge branch 'js/maint-submodule-checkout'
2009-04-08 Junio C HamanoMerge branch 'cb/maint-merge-recursive-submodule-fix'
2009-04-06 Junio C HamanoMerge branch 'jc/shared-literally'
2009-04-05 Junio C HamanoMerge branch 'maint'
2009-04-05 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-05 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-02 Junio C HamanoSync with 1.6.2.2
2009-04-02 Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s' into maint
2009-04-02 Junio C HamanoMerge branch 'js/maint-diff-temp-smudge' into maint
2009-04-02 Junio C HamanoMerge branch 'js/maint-1.6.0-exec-path-env' into maint
2009-04-02 Junio C HamanoMerge branch 'bc/maint-1.6.1-branch-deleted-was' into...
2009-04-02 Junio C HamanoMerge branch 'tr/maint-1.6.1-doc-format-patch--root...
2009-04-02 Junio C HamanoMerge branch 'tr/maint-1.6.1-doc-format-patch--root'
2009-04-02 Junio C HamanoMerge branch 'maint'
2009-04-02 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-02 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-02 Junio C HamanoMerge branch 'jc/maint-1.6.0-keep-pack'
2009-04-02 Junio C HamanoMerge branch 'kb/tracking-count-no-merges'
2009-03-30 Junio C HamanoMerge branch 'maint'
2009-03-30 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-03-30 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-03-30 Junio C HamanoMerge branch 'maint'
2009-03-30 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-03-30 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-03-28 Junio C HamanoMerge branch 'maint'
2009-03-28 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully'
2009-03-28 Junio C HamanoMerge branch 'js/remote-improvements'
2009-03-28 Junio C HamanoMerge branch 'jk/clone-post-checkout'
next