Merge branch 'jc/status-show-ignored'
[gitweb.git] / Documentation / merge-options.txt
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-05-04 Merge branch 'maint-1.7.0' into maint
2010-05-02 Merge branch 'maint'
2010-04-24 Merge branch 'maint'
2010-04-23 Sync with 1.7.0.6
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-22 Merge branch 'maint'
2010-04-20 Merge branch '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 'wp/doc-filter-direction'
2010-04-19 Merge branch 'jk/maint-diffstat-overflow'
2010-04-19 Merge branch 'jg/auto-initialize-notes-with-percent...
2010-04-19 Merge branch 'maint'
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-17 Merge branch 'maint'
2010-04-14 Merge branch 'maint'
2010-04-12 Docs: Add -X option to git-merge's synopsis.
2010-04-11 Merge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-11 Sync with 1.7.0.5
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-10 Merge branch 'maint'
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-09 Merge branch 'maint'
2010-04-06 Merge branch 'da/maint-python-startup'
2010-04-06 Merge branch 'jc/conflict-marker-size'
2010-04-06 Merge branch 'ef/maint-empty-commit-log'
2010-04-06 Merge branch 'sg/bash-completion'
2010-04-04 Merge branch 'maint'
2010-04-03 Merge branch 'sp/maint-http-backend-die-triggers-die...
2010-04-03 Merge branch 'rr/imap-send-unconfuse-from-line'
2010-04-03 Merge branch 'mg/use-default-abbrev-length-in-rev-list'
2010-04-03 Merge branch 'mg/maint-send-email-lazy-editor'
2010-04-03 Merge branch 'rb/maint-python-path'
2010-04-03 Merge branch 'mg/mailmap-update'
2010-04-03 Merge branch 'gh/maint-stash-show-error-message'
2010-04-03 Merge branch 'bc/maint-daemon-sans-ss-family'
2010-04-03 Merge branch 'ja/send-email-ehlo'
2010-04-03 Merge branch 'do/rebase-i-arbitrary'
2010-03-31 Sync with 1.7.0.4
2010-03-31 Merge branch 'jc/maint-refs-dangling' into maint
2010-03-30 Merge branch 'maint'
2010-03-29 Merge branch 'cc/cherry-pick-ff'
2010-03-29 Merge branch 'sb/notes-parse-opt'
2010-03-29 Merge branch 'maint'
2010-03-29 Merge branch 'cp/add-u-pathspec' into maint
2010-03-29 Merge branch 'maint'
2010-03-24 Merge branch 'jh/maint-submodule-status-in-void'
2010-03-24 Merge branch 'tr/notes-display'
2010-03-24 Merge branch 'jl/submodule-diff-dirtiness'
2010-03-24 Merge branch 'pb/log-first-parent-p-m'
2010-03-24 Merge branch 'jc/maint-refs-dangling'
2010-03-24 Merge branch 'maint'
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 Sync with Git 1.7.0.3
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 'ml/color-grep'
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-20 Merge branch 'cc/reset-keep'
2010-03-20 Merge branch 'fl/askpass'
2010-03-20 Merge branch 'bg/apply-fix-blank-at-eof'
2010-03-20 Merge branch 'bw/union-merge-refactor'
2010-03-20 Merge branch 'maint'
2010-03-17 Merge branch 'maint'
2010-03-17 Merge branch 'maint'
2010-03-15 Merge branch 'sd/format-patch-to'
2010-03-15 Merge branch 'tc/http-cleanup'
2010-03-15 Merge branch 'tc/transport-verbosity'
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...
next