Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'
[gitweb.git] / Documentation / git-merge.txt
2010-05-21 Merge branch 'jc/maint-no-reflog-expire-unreach-for...
2010-05-21 Merge branch 'tr/word-diff'
2010-05-21 Merge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-05-21 Merge branch 'jc/status-show-ignored'
2010-05-21 Merge branch 'np/malloc-threading'
2010-05-21 Merge branch 'sr/remote-helper-export'
2010-05-21 Merge branch 'ld/discovery-limit-to-fs' (early part)
2010-05-21 Merge branch 'ar/config-from-command-line'
2010-05-21 Merge branch 'em/checkout-orphan'
2010-05-09 Merge branch 'bg/apply-blank-trailing-context'
2010-05-09 Merge branch 'bg/send-email-smtpdomain'
2010-05-09 Merge branch 'rc/ls-remote-default'
2010-05-09 Merge branch 'rc/maint-curl-helper'
2010-05-09 Merge branch 'hg/maint-attr-fix'
2010-05-09 Merge branch 'eb/unpretty-b-format'
2010-05-09 Merge branch 'ab/commit-empty-message'
2010-05-09 Merge branch 'jc/test-sleepless'
2010-05-09 Merge branch 'jc/maint-reflog-expire-unreachable'
2010-05-09 Merge branch 'sd/log-decorate'
2010-05-09 Merge branch 'mh/status-optionally-refresh'
2010-05-09 Merge branch 'cw/ws-indent-with-tab'
2010-05-09 Merge branch 'cc/revert-strategy'
2010-05-09 Merge branch 'sc/http-late-auth'
2010-05-09 Merge branch 'jk/cached-textconv'
2010-05-09 Merge branch 'pc/remove-warn'
2010-04-23 Merge branch 'mg/use-default-abbrev-length-in-rev-list...
2010-04-23 Merge branch 'jk/maint-diffstat-overflow' into maint
2010-04-23 Merge branch 'da/maint-python-startup' into maint
2010-04-19 Merge branch 'maint-1.6.6' into maint
2010-04-19 Merge branch 'rr/remote-helper-doc'
2010-04-19 Merge branch 'jk/maint-diffstat-overflow'
2010-04-19 Merge branch 'jg/auto-initialize-notes-with-percent...
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-14 Merge branch 'maint'
2010-04-12 Docs: Add -X option to git-merge's synopsis.
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'jc/conflict-marker-size' into maint
2010-04-10 Merge branch 'mg/maint-send-email-lazy-editor' into...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-04-06 Merge branch 'jc/conflict-marker-size'
2010-04-03 Merge branch 'mg/maint-send-email-lazy-editor'
2010-03-31 Merge branch 'jc/maint-refs-dangling' into maint
2010-03-29 Merge branch 'sb/notes-parse-opt'
2010-03-29 Merge branch 'cp/add-u-pathspec' into maint
2010-03-24 Merge branch 'tr/notes-display'
2010-03-24 Merge branch 'jc/maint-refs-dangling'
2010-03-24 Merge branch 'jc/color-attrs' into maint
2010-03-24 Merge branch 'jk/maint-add-ignored-dir' into maint
2010-03-22 Merge branch 'maint-1.6.6' into maint
2010-03-20 Merge branch 'jk/maint-add-ignored-dir'
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-15 Merge branch 'jh/notes'
2010-03-10 Merge branch 'cp/add-u-pathspec'
2010-03-08 Merge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08 Merge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-08 Merge branch 'jk/maint-add--interactive-delete' into...
2010-03-08 Merge branch 'jc/grep-author-all-match-implicit' into...
2010-03-08 Merge branch 'maint-1.6.6' into maint
2010-03-07 Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
2010-03-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07 Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
2010-03-07 Merge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-07 Merge branch 'fn/maint-mkdtemp-compat'
2010-03-07 Merge branch 'jk/maint-push-tracking-wo-remote'
2010-03-07 Merge branch 'nd/root-git'
2010-03-07 Merge branch 'jk/maint-add--interactive-delete'
2010-03-05 Merge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Merge branch 'rs/optim-text-wrap' into maint
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-05 Merge branch 'cc/maint-bisect-paths' into maint
2010-03-05 Merge branch 'maint-1.6.6' into maint
2010-03-03 Merge branch 'hm/maint-imap-send-crlf' into maint
2010-03-03 Merge branch 'sp/maint-push-sideband' into maint
2010-03-03 Merge branch 'jc/maint-fix-test-perm' into maint
2010-03-02 Merge branch 'tr/maint-cherry-pick-list'
2010-03-02 Merge branch 'rs/optim-text-wrap'
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
2010-03-02 Merge branch 'jc/grep-author-all-match-implicit'
2010-03-01 Merge branch 'cc/maint-bisect-paths'
2010-02-26 Merge branch 'maint-1.6.6' into maint
2010-02-24 Merge branch 'ml/maint-grep-doc' into maint
2010-02-23 Merge branch 'il/rev-glob'
2010-02-21 Merge branch 'ml/maint-grep-doc'
2010-02-21 Merge branch 'hm/maint-imap-send-crlf'
2010-02-21 Merge branch 'jc/maint-fix-test-perm'
2010-02-19 Merge branch 'jk/maint-rmdir-fix' into maint
2010-02-16 Merge branch 'maint-1.6.6' into maint
2010-02-15 Merge branch 'maint-1.6.6' into maint
2010-02-12 Merge branch 'maint'
2010-02-12 Merge branch 'maint'
2010-02-10 Sync with 1.6.6.2
2010-02-10 Merge branch 'jh/maint-config-file-prefix' into maint
2010-02-10 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-10 Merge branch 'sp/maint-push-sideband' into sp/push...
2010-02-09 Merge branch 'maint'
2010-02-09 Merge branch 'jc/maint-push-doc-status' into maint
2010-02-08 Merge branch 'jc/maint-imap-config-parse' into maint
2010-02-08 Merge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Merge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-07 Merge branch 'maint'
next