ls-tree manpage: use "unless" instead of "when ... is not"
[gitweb.git] / Documentation / merge-config.txt
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-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-09-19 Merge branch 'dp/maint-rebase-fix' into maint
2008-09-19 Merge branch 'jc/maint-checkout-keep-remove' into maint
2008-09-19 Merge branch 'jc/maint-diff-quiet' into maint
2008-09-19 Merge branch 'jc/maint-name-hash-clear' into maint
2008-09-19 Merge branch 'jc/maint-template-permbits' into maint
2008-09-19 Merge branch 'mh/maint-honor-no-ssl-verify' into maint
2008-09-12 Merge branch 'ho/maint-dashless' into maint
2008-09-12 Fix some manual typos.
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 'rs/archive-parse-options'
2008-08-06 Documentation: typos / spelling fixes
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-08 Merge branch 'jc/blame' (early part) into HEAD
2008-07-08 Merge branch 'lt/racy-empty' into maint
2008-07-06 Merge git://repo.or.cz/git-gui
2008-06-27 Merge branch 'maint-1.5.5' into maint
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 'maint'
2008-05-27 Merge git://repo.or.cz/git-gui
2008-05-26 Merge branch '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'
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'
2008-05-23 Merge branch 'maint'
2008-05-21 Merge branch 'maint'
2008-05-21 Merge branch 'ar/add-unreadable'
2008-05-21 Merge branch 'ds/branch-auto-rebase'
2008-05-21 Merge branch 'sv/first-parent'
2008-05-21 Merge branch 'np/pack'
2008-05-21 Merge branch 'as/graph'
2008-05-21 Merge branch 'jk/maint-send-email-compose'
2008-05-21 Merge branch 'hb/maint-send-email-quote-recipients'
2008-05-17 Merge branch 'maint'
2008-05-15 Merge git://repo.or.cz/git-gui
2008-05-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-14 Merge branch 'maint'
2008-05-14 Merge branch 'sb/committer'
2008-05-14 Merge branch 'bd/tests'
2008-05-14 Merge branch 'mv/format-cc'
2008-05-14 Merge branch 'cc/hooks-doc'
2008-05-14 Merge branch 'jk/renamelimit' (early part)
2008-05-12 Merge branch 'gp/bisect-fix'
2008-05-11 Merge branch 'maint'
2008-05-11 Merge branch 'py/diff-submodule'
2008-05-11 Merge branch 'lt/case-insensitive'
2008-05-09 Merge branch 'maint'
2008-05-09 Merge branch 'sg/merge-options' (early part)
2008-05-03 add merge.renamelimit config option
2008-05-03 Merge commit 'sg/merge-options^' into jk/renamelimit
2008-04-13 fmt-merge-msg: add '--(no-)log' options and 'merge...
2008-04-13 add 'merge.stat' config variable
2008-04-13 doc: moved merge.* config variables into separate merge...