Docs: Add -X option to git-merge's synopsis.
[git/git.git] / Documentation / git-merge.txt
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-03-31 Junio C HamanoMerge branch 'jc/maint-refs-dangling' into maint
2010-03-29 Junio C HamanoMerge branch 'cp/add-u-pathspec' into maint
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-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-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-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-19 Junio C HamanoMerge branch 'jk/maint-rmdir-fix' into maint
2010-02-16 Junio C HamanoMerge branch 'maint-1.6.6' into maint
2010-02-15 Junio C HamanoMerge branch 'maint-1.6.6' into maint
2010-02-12 Junio C HamanoMerge branch 'maint'
2010-02-12 Junio C HamanoMerge branch 'maint'
2010-02-10 Junio C HamanoSync with 1.6.6.2
2010-02-10 Junio C HamanoMerge branch 'jh/maint-config-file-prefix' into maint
2010-02-10 Junio C HamanoMerge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-09 Junio C HamanoMerge branch 'maint'
2010-02-09 Junio C HamanoMerge branch 'jc/maint-push-doc-status' into maint
2010-02-08 Junio C HamanoMerge branch 'jc/maint-imap-config-parse' into maint
2010-02-08 Junio C HamanoMerge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Junio C HamanoMerge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-07 Junio C HamanoMerge branch 'maint'
2010-02-06 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-02-06 Junio C HamanoMerge branch 'maint'
2010-02-01 Junio C HamanoMerge branch 'sp/maint-fast-import-large-blob' into...
2010-01-31 Junio C HamanoMerge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-30 Junio C HamanoMerge branch 'maint'
2010-01-29 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-28 Junio C HamanoMerge branch 'maint'
2010-01-28 Junio C HamanoMerge branch 'gp/maint-cvsserver'
2010-01-27 Junio C HamanoMerge branch 'jc/maint-reflog-bad-timestamp'
2010-01-27 Junio C HamanoMerge branch 'il/maint-colon-address'
2010-01-27 Junio C HamanoMerge branch 'il/maint-xmallocz'
2010-01-27 Junio C HamanoMerge branch 'jh/maint-config-file-prefix'
2010-01-27 Junio C HamanoMerge branch 'jl/diff-submodule-ignore'
2010-01-25 Junio C HamanoMerge branch 'jc/fix-tree-walk'
2010-01-24 Junio C HamanoMerge branch 'maint'
2010-01-24 Junio C HamanoMerge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-24 Junio C HamanoMerge branch 'doc-style/for-next' of git://repo.or...
2010-01-24 Jonathan NiederDocumentation: merge: use MERGE_HEAD to refer to the...
2010-01-24 Jonathan NiederDocumentation: simplify How Merge Works
2010-01-24 Jonathan NiederDocumentation: merge: add a section about fast-forward
2010-01-24 Jonathan NiederDocumentation: emphasize when git merge terminates...
2010-01-24 Jonathan NiederDocumentation: merge: add an overview
2010-01-24 Jonathan NiederDocumentation: merge: move merge strategy list to end
2010-01-24 Jonathan NiederDocumentation: suggest `reset --merge` in How Merge...
2010-01-24 Jonathan NiederDocumentation: merge: move configuration section to end
2010-01-23 Junio C HamanoMerge branch 'maint'
2010-01-23 Junio C HamanoMerge branch 'jc/branch-d'
2010-01-23 Junio C HamanoMerge branch 'il/rev-glob'
2010-01-23 Junio C HamanoMerge branch 'js/refer-upstream'
2010-01-23 Junio C HamanoMerge branch 'jl/submodule-diff'
2010-01-23 Junio C HamanoMerge branch 'il/remote-updates'
2010-01-23 Junio C HamanoMerge branch 'il/branch-set-upstream'
2010-01-23 Junio C HamanoMerge branch 'jc/maint-limit-note-output'
2010-01-23 Junio C HamanoMerge branch 'nd/ls-files-sparse-fix'
2010-01-22 Junio C HamanoMerge branch 'maint'
2010-01-21 Junio C HamanoMerge branch 'bw/cvsimport'
2010-01-21 Junio C HamanoMerge branch 'jc/checkout-merge-base'
2010-01-21 Junio C HamanoMerge branch 'ag/patch-header-verify'
2010-01-21 Junio C HamanoMerge branch 'jc/conflict-marker-size'
2010-01-21 Junio C HamanoMerge branch 'ag/maint-apply-too-large-p'
2010-01-21 Junio C HamanoMerge branch 'ap/merge-backend-opts'
2010-01-21 Junio C HamanoMerge branch 'nd/status-partial-refresh'
2010-01-21 Junio C HamanoMerge remote branch 'remotes/trast-doc/for-next'
2010-01-21 Junio C HamanoMerge branch 'jh/notes' (early part)
2010-01-21 Junio C HamanoMerge branch 'maint'
2010-01-20 Junio C HamanoMerge branch 'rr/core-tutorial'
2010-01-20 Junio C HamanoMerge branch 'jc/cache-unmerge'
2010-01-20 Junio C HamanoMerge branch 'js/exec-error-report'
2010-01-20 Junio C HamanoMerge branch 'jc/ls-files-ignored-pathspec'
2010-01-20 Junio C HamanoMerge branch 'jc/grep-lookahead'
2010-01-20 Junio C HamanoMerge branch 'jc/maint-strbuf-add-fix-doubling'
2010-01-20 Junio C HamanoMerge branch 'mm/conflict-advice'
2010-01-20 Junio C HamanoMerge branch 'da/difftool'
2010-01-20 Junio C HamanoMerge branch 'mh/rebase-fixup'
2010-01-20 Junio C HamanoMerge branch 'ns/rebase-auto-squash'
2010-01-20 Junio C HamanoMerge branch 'mh/rebase-fixup' (early part)
2010-01-20 Junio C HamanoMerge branch 'il/push-set-upstream'
2010-01-20 Junio C HamanoMerge branch 'jk/warn-author-committer-after-commit'
next