merge-recursive: options to ignore whitespace changes
[git/git.git] / Documentation / merge-strategies.txt
2010-08-27 Justin Frankelmerge-recursive: options to ignore whitespace changes
2010-08-26 Justin Frankelmerge-recursive --patience
2010-08-06 Jonathan Niedermerge-recursive --renormalize
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 'hg/maint-attr-fix' into maint
2010-05-21 Junio C HamanoMerge branch 'jn/gitweb-our-squelch'
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 'sp/maint-describe-tiebreak-with-tagger...
2010-05-09 Junio C HamanoMerge branch 'hg/maint-attr-fix'
2010-05-09 Junio C HamanoMerge branch 'jc/maint-reflog-expire-unreachable'
2010-04-23 Junio C HamanoMerge branch 'jk/maint-diffstat-overflow' into maint
2010-04-19 Junio C HamanoMerge branch 'maint-1.6.6' into maint
2010-04-19 Junio C HamanoMerge branch 'jk/maint-diffstat-overflow'
2010-04-19 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
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 'cp/add-u-pathspec' into maint
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-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 'rs/optim-text-wrap' 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 'cc/maint-bisect-paths' into maint-1.6.6
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-05 Junio C HamanoMerge branch 'maint-1.6.5' into maint-1.6.6
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'
2010-02-21 Junio C HamanoMerge branch 'hm/maint-imap-send-crlf'
2010-02-21 Junio C HamanoMerge branch 'jc/maint-fix-test-perm'
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-16 Junio C HamanoMerge branch 'maint-1.6.5' into maint-1.6.6
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 'maint-1.6.5' into maint
2010-02-10 Junio C HamanoMerge branch 'gp/maint-cvsserver' into maint
2010-02-10 Junio C HamanoMerge branch 'jc/maint-reflog-bad-timestamp' into maint
2010-02-10 Junio C HamanoMerge branch 'il/maint-xmallocz' into maint
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-10 Junio C HamanoMerge branch 'sp/maint-push-sideband' into sp/push...
2010-02-09 Junio C HamanoMerge branch 'maint'
2010-02-09 Junio C HamanoMerge branch 'maint-1.6.5' into 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 'sp/maint-push-sideband' into sp/push...
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-30 Junio C HamanoMerge branch 'maint-1.6.5' into 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'
next