Code

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