git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / rev-list-options.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 Do not talk about "diff" in rev-list documentation.
2008-08-13 Merge git://git.bogomips.org/git-svn
2008-08-13 Documentation: rev-list-options: Rewrite simplification...
2008-08-12 Merge branch 'maint'
2008-08-12 Documentation: rev-list-options: Fix a typo
2008-08-11 Merge branch 'maint'
2008-08-11 Re-fix rev-list-options documentation
2008-08-11 Merge branch 'maint'
2008-08-11 Documentation: rev-list-options: Fix -g paragraph forma...
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-07 Merge branch 'ag/rewrite_one' 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-08-02 Documentation: clarify diff --cc
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-23 Documentation: clarify diff --cc
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 '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/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-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-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 'sr/tests'
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-22 Merge branch 'mo/status-untracked'
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
2008-06-11 Merge branch 'maint'
2008-06-09 Merge branch 'js/merge-recursive'
2008-06-09 Merge branch 'maint'
2008-06-08 Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-07 Merge 1.5.5.4 in
2008-06-06 Merge branch 'maint'
2008-06-04 Merge branch 'maint'
2008-06-04 Documentation: git-log cannot use rev-list specific...
2008-05-28 Merge 1.5.5.3 in
2008-05-27 Merge branch 'maint'
2008-05-27 Merge branch 'gp/bisect-fix' into maint
2008-05-27 Merge git://repo.or.cz/git-gui
2008-05-26 Merge branch 'maint'
2008-05-26 Merge branch 'jk/maint-send-email-compose' into maint
2008-05-26 Merge branch 'hb/maint-send-email-quote-recipients...
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 'jc/add-n-u'
2008-05-25 Merge branch 'ar/t6031'
2008-05-25 Merge branch 'db/clone-in-c'
2008-05-25 Merge branch 'jc/apply-whitespace'
2008-05-25 Merge branch 'jc/unpack-trees-reword'
2008-05-25 Merge branch 'ar/batch-cat'
2008-05-25 Merge branch 'cc/bisect'
2008-05-25 Merge branch 'ap/svn'
2008-05-25 Merge branch 'js/cvsexportcommit'
2008-05-25 Merge branch 'js/ignore-submodule'
2008-05-25 Merge branch 'mo/cvsserver'
2008-05-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-23 Merge branch 'pb/push'
2008-05-23 Merge branch 'bc/repack'
2008-05-23 Merge branch 'sp/ignorecase'
next