git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / gitattributes.txt
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge branch 'ak/p4'
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-13 Merge git://git.bogomips.org/git-svn
2008-08-12 Teach git diff about BibTeX head hunk patterns
2008-08-12 gitattributes: Document built in hunk header patterns
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-07 Merge branch 'lt/config-fsync' into maint
2008-08-07 Merge branch 'jc/reflog-expire' into 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 Merge git://repo.or.cz/git-gui
2008-07-25 Merge branch 'maint'
2008-07-24 Merge branch 'maint' into ph/checkout
2008-07-21 Merge branch 'maint'
2008-07-19 Merge branch 'maint'
2008-07-17 Merge branch 'sp/maint-index-pack'
2008-07-17 Merge branch 'maint'
2008-07-16 Merge branch 'js/maint-daemon-syslog' into maint
2008-07-16 Merge branch 'mv/merge-in-c'
2008-07-16 Merge branch 'ag/rewrite_one'
2008-07-16 Merge branch 'js/maint-pretty-mailmap'
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-15 Merge branch 'ls/maint-mailinfo-patch-label'
2008-07-15 Merge branch 'jc/branch-merged'
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 Merge branch 'tr/add-i-e'
2008-07-09 Merge branch 'js/apply-root'
2008-07-09 Merge branch 'jc/reflog-expire'
2008-07-09 Merge branch 'sp/maint-pack-memuse'
2008-07-09 Merge branch 'maint'
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 'qq/maint'
2008-07-07 Merge branch 'js/maint-daemon-syslog'
2008-07-07 Merge branch 'maint'
2008-07-07 Merge branch 'qq/maint' (early part) into maint
2008-07-07 Merge branch 'jc/rerere'
2008-07-07 Merge branch 'dr/ceiling'
2008-07-07 Merge branch 'db/no-git-config'
2008-07-07 Merge branch 'js/import-zip'
2008-07-07 Merge branch 'maint'
2008-07-07 Merge branch 'qq/maint'
2008-07-06 Merge git://repo.or.cz/git-gui
2008-07-06 Merge branch 'qq/maint'
2008-07-06 Merge branch 'qq/maint'
2008-07-06 attribute documentation: keep EXAMPLE at end
2008-07-05 manpages: italicize nongit command names (if they are...
2008-07-05 manpages: italicize git command names (which were in...
2008-07-04 Merge branch 'maint'
2008-07-03 Merge branch 'j6t/mingw'
2008-07-03 Merge branch 'maint'
2008-07-02 Documentation formatting and cleanup
2008-07-02 Documentation: be consistent about "git-" versus "git "
2008-07-02 Merge maint in
2008-07-01 Merge branch 'ph/mergetool'
2008-07-01 Merge branch 'js/maint-clone-insteadof'
2008-07-01 Merge branch 'jc/maint-reset'
2008-07-01 Merge branch 'jk/maint-fetch-ref-hier'
2008-07-01 Merge branch 'jc/dashless' (early part)
2008-07-01 Merge branch 'nd/dashless'
2008-06-30 Merge branch 'maint'
2008-06-29 Merge branch 'maint'
2008-06-27 Merge branch 'maint'
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-26 Merge branch 'maint'
2008-06-25 Merge branch 'sb/rebase'
2008-06-25 Merge branch 'lw/gitweb'
2008-06-25 Merge branch 'lt/config-fsync'
2008-06-25 Merge branch 'sr/tests'
2008-06-25 Merge branch 'jh/clone-packed-refs'
2008-06-25 Merge branch 'lw/perlish'
2008-06-25 Merge branch 'jc/maint-combine-diff-pre-context' into...
2008-06-24 Merge branch 'maint'
2008-06-23 Merge branch 'maint'
2008-06-22 Merge branch 'rs/archive-ignore'
2008-06-22 Merge branch 'lt/racy-empty'
2008-06-22 Merge branch 'jc/maint-combine-diff-pre-context'
2008-06-22 Merge branch 'kh/update-ref'
2008-06-17 Merge branch 'maint'
2008-06-16 Merge branch 'maint'
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
next