Documentation/git-pull.txt: Add subtitles above included option files
[git/git.git] / Documentation / merge-options.txt
2009-10-04 Junio C HamanoMerge branch 'jc/maint-1.6.4-show-branch-default' into...
2009-09-21 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-16 Junio C HamanoMerge branch 'tf/diff-whitespace-incomplete-line' into...
2009-09-03 Junio C HamanoMerge branch 'maint-1.6.2' into maint-1.6.3
2009-09-03 Junio C HamanoMerge branch 'maint-1.6.2' into maint-1.6.3
2009-09-01 Junio C HamanoMerge branch 'tf/diff-whitespace-incomplete-line'
2009-08-28 Junio C HamanoMerge branch 'maint-1.6.2' into maint-1.6.3
2009-08-28 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-08-28 Junio C HamanoMerge branch 'maint-1.5.6' into maint-1.6.0
2009-08-26 Junio C HamanoMerge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...
2009-08-21 Junio C HamanoMerge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-19 Junio C HamanoMerge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
2009-08-16 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-11 Junio C HamanoMerge branch 'jc/maint-merge-recursive-fix'
2009-08-08 Junio C HamanoMerge branch 'maint-1.6.2' into maint-1.6.3
2009-08-08 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-07-29 Junio C HamanoMerge branch 'hv/cvsps-tests'
2009-07-02 Junio C HamanoMerge branch 'cc/bisect'
2009-07-02 Junio C HamanoMerge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
2009-06-22 Junio C HamanoMerge branch 'sb/maint-1.6.0-add-config-fix' into maint
2009-06-22 Junio C HamanoMerge branch 'rc/maint-http-local-slot-fix' into maint
2009-06-22 Junio C HamanoMerge branch 'pb/maint-1.6.2-userdiff-fix' into maint
2009-06-21 Junio C HamanoMerge branch 'maint-1.6.2' into maint
2009-06-21 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-06-21 Junio C HamanoMerge branch 'ph/submodule-rebase'
2009-06-21 Junio C HamanoMerge branch 'jc/cache-tree'
2009-06-21 Junio C HamanoMerge branch 'pb/maint-1.6.2-userdiff-fix'
2009-06-21 Junio C HamanoMerge branch 'sb/maint-1.6.0-add-config-fix'
2009-06-20 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-14 Junio C HamanoMerge branch 'maint-1.6.2' into maint
2009-06-14 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-06-13 Junio C HamanoMerge branch 'rc/http-push'
2009-06-13 Junio C HamanoMerge branch 'cc/bisect' (early part)
2009-06-13 Junio C HamanoMerge branch 'rc/maint-http-local-slot-fix'
2009-06-13 Junio C HamanoMerge branch 'ph/submodule-rebase' (early part)
2009-06-13 Junio C HamanoMerge branch 'da/araxis-mergetool'
2009-06-11 Junio C HamanoMerge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-06-02 Junio C HamanoMerge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
2009-06-02 Junio C HamanoMerge branch 'rs/maint-grep-word-regexp-fix' into maint
2009-06-02 Junio C HamanoMerge branch 'sb/maint-1.6.2-opt-filename-fix' into...
2009-06-02 Junio C HamanoMerge branch 'jc/maint-add-p-coalesce-fix' into maint
2009-05-31 Junio C HamanoMerge branch 'sb/opt-filename'
2009-05-31 Junio C HamanoMerge branch 'jc/solaris-0811'
2009-05-31 Junio C HamanoMerge branch 'sb/show-branch-parse-options'
2009-05-31 Junio C HamanoMerge branch 'mm/apply-double-slash'
2009-05-31 Junio C HamanoMerge branch 'sb/format-patch-parseopt'
2009-05-31 Junio C HamanoMerge branch 'jc/mktree'
2009-05-31 Junio C HamanoMerge branch 'mw/send-email'
2009-05-31 Junio C HamanoMerge branch 'cc/bisect' (early part)
2009-05-31 Eric Wongt9139 uses ancient, backwards-compatible iconv names
2009-05-29 Junio C HamanoMerge branch 'sb/maint-1.6.2-opt-filename-fix'
2009-05-29 Junio C HamanoMerge branch 'jc/maint-add-p-coalesce-fix'
2009-05-29 Junio C HamanoMerge branch 'rs/maint-grep-word-regexp-fix'
2009-05-26 Junio C HamanoMerge branch 'maint'
2009-05-26 Junio C HamanoMerge branch 'js/maint-no-ln-across-libexec-and-bin...
2009-05-26 Junio C HamanoMerge branch 'lt/maint-diff-reduce-lstat' into maint
2009-05-26 Junio C HamanoMerge branch 'jm/format-patch-no-auto-n-when-k-is-given...
2009-05-26 Junio C HamanoMerge branch 'do/maint-merge-recursive-fix' into maint
2009-05-26 Junio C HamanoMerge branch 'jk/maint-1.6.0-trace-argv' into maint
2009-05-26 Junio C HamanoMerge branch 'np/push-delta' into maint
2009-05-26 Junio C HamanoMerge branch 'ar/merge-one-file-diag' into maint
2009-05-26 Junio C HamanoMerge branch 'ar/unlink-err' into maint
2009-05-26 Junio C HamanoMerge branch 'jk/maint-add-empty' into maint
2009-05-25 Michael J Grubermerge-options.txt: Clarify merge --squash
2009-05-24 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-05-23 Junio C HamanoMerge branch 'jk/maint-1.6.0-trace-argv'
2009-05-14 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-05-09 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-05-06 Junio C HamanoMerge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
2009-05-06 Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-05-03 Junio C HamanoMerge branch 'lt/pack-object-memuse' into maint
2009-05-03 Junio C HamanoMerge branch 'jc/maint-1.6.0-keep-pack' into maint...
2009-05-03 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-05-03 Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-05-02 Junio C HamanoMerge git://repo.or.cz/git-gui
2009-05-01 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-29 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-28 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-25 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-18 Junio C HamanoMerge branch 'lt/pack-object-memuse'
2009-04-18 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-18 Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-04-18 Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-04-18 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-12 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-09 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-04-09 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-09 Junio C HamanoMerge branch 'jc/maint-1.6.0-keep-pack' into maint
2009-04-09 Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
2009-04-09 Junio C HamanoMerge branch 'js/maint-1.6.0-exec-path-env' into maint...
2009-04-08 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-08 Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix'
2009-04-05 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-02 Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s' into maint
2009-04-02 Junio C HamanoMerge branch 'js/maint-1.6.0-exec-path-env' into maint
2009-04-02 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-02 Junio C HamanoMerge branch 'jc/maint-1.6.0-keep-pack'
2009-03-30 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-03-30 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-03-28 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully'
next