checkout: document subtlety around --ours/--theirs
[git] / Documentation / git-stage.txt
2015-01-12  Junio C HamanoMerge branch 'jk/read-packed-refs-without-path-max...
2015-01-12  Junio C HamanoMerge branch 'mh/find-uniq-abbrev' into maint
2015-01-12  Junio C HamanoMerge branch 'jk/approxidate-avoid-y-d-m-over-future...
2015-01-12  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-12  Junio C HamanoMerge branch 'jk/for-each-reflog-ent-reverse' into...
2015-01-07  Junio C HamanoMerge branch 'maint-2.1' into maint
2014-12-22  Junio C HamanoMerge branch 'jk/rebuild-perl-scripts-with-no-perl...
2014-12-22  Junio C HamanoMerge branch 'po/everyday-doc' into maint
2014-12-22  Junio C HamanoMerge branch 'jk/push-simple' into maint
2014-12-22  Junio C HamanoMerge branch 'mh/config-flip-xbit-back-after-checking...
2014-12-22  Junio C HamanoMerge branch 'jk/gitweb-with-newer-cgi-multi-param...
2014-12-22  Junio C HamanoMerge branch 'rs/receive-pack-use-labs' into maint
2014-12-22  Junio C HamanoMerge branch 'rs/maint-config-use-labs' into maint
2014-12-22  Junio C HamanoMerge branch 'js/windows-open-eisdir-error' into maint
2014-12-22  Junio C HamanoMerge branch 'jk/colors-fix' into maint
2014-12-22  Junio C HamanoMerge branch 'jk/checkout-from-tree' into maint
2014-12-17  Junio C HamanoSync with v2.1.4
2014-11-19  Junio C HamanoMerge branch 'sv/submitting-final-patch'
2014-11-19  Junio C HamanoMerge branch 'sn/tutorial-status-output-example'
2014-11-19  Junio C HamanoMerge branch 'mh/doc-remote-helper-xref'
2014-11-19  Junio C HamanoMerge branch 'tb/no-relative-file-url'
2014-11-19  Junio C HamanoMerge branch 'cc/interpret-trailers'
2014-11-18  Junio C HamanoMerge branch 'jc/doc-commit-only'
2014-11-18  Junio C HamanoMerge branch 'da/difftool'
2014-11-12  Junio C HamanoSync with 'maint'
2014-11-12  Junio C HamanoMerge branch 'jk/fetch-reflog-df-conflict'
2014-11-11  Junio C HamanoSync with maint
2014-11-10  Junio C HamanoSync with maint
2014-11-10  Junio C HamanoMerge branch 'js/diff-highlight-avoid-sigpipe'
2014-11-06  Junio C HamanoMerge branch 'maint'
2014-11-06  Junio C HamanoMerge branch 'nd/gitignore-trailing-whitespace'
2014-11-06  Junio C HamanoMerge branch 'tm/line-log-first-parent'
2014-11-06  Junio C HamanoMerge branch 'jk/fetch-reflog-df-conflict'
2014-11-06  Junio C HamanoMerge branch 'jk/cache-tree-protect-from-broken-libgit2'
2014-10-31  Junio C HamanoMerge branch 'jc/push-cert'
2014-10-31  Junio C HamanoMerge branch 'rs/child-process-init'
2014-10-31  Junio C HamanoMerge branch 'rs/grep-color-words'
2014-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-10-29  Junio C HamanoSync with Git 2.1.3
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-29  Junio C HamanoMerge branch 'da/difftool'
2014-10-29  Junio C HamanoMerge branch 'rb/pack-window-memory-config-doc'
2014-10-29  Junio C HamanoMerge branch 'mg/lib-gpg-ro-safety'
2014-10-29  Junio C HamanoMerge branch 'dm/port2zos'
2014-10-29  Junio C HamanoMerge branch 'oc/mergetools-beyondcompare'
2014-10-29  Junio C HamanoMerge branch 'jk/prune-mtime'
2014-10-24  Junio C HamanoMerge branch 'jc/push-cert'
2014-10-24  Junio C HamanoMerge branch 'sb/plug-transport-leak'
2014-10-24  Junio C HamanoMerge branch 'nd/dir-prep-exclude-cleanup'
2014-10-24  Junio C HamanoMerge branch 'eb/no-pthreads'
2014-10-24  Junio C HamanoMerge branch 'wk/t1304-wo-USER'
2014-10-24  Junio C HamanoMerge branch 'tb/core-filemode-doc'
2014-10-24  Junio C HamanoMerge branch 'rs/run-command-env-array'
2014-10-24  Junio C HamanoMerge branch 'po/doc-status-markup'
2014-10-24  Junio C HamanoMerge branch 'jk/pack-objects-no-bitmap-when-splitting'
2014-10-21  Junio C HamanoMerge branch 'js/completion-hide-not-a-repo'
2014-10-21  Junio C HamanoMerge branch 'da/mergetool-meld'
2014-10-21  Junio C HamanoMerge branch 'da/mergetool-temporary-directory'
2014-10-21  Junio C HamanoMerge branch 'da/mergetool-tool-help'
2014-10-21  Junio C HamanoMerge branch 'da/mergetool-temporary-filename'
2014-10-21  Junio C HamanoMerge branch 'da/mergetool-tests'
2014-10-21  Junio C HamanoMerge branch 'rs/ref-transaction'
2014-10-20  Junio C HamanoMerge branch 'cc/interpret-trailers'
2014-10-20  Junio C HamanoMerge branch 'rm/gitweb-start-form'
2014-10-20  Junio C HamanoMerge branch 'ss/contrib-subtree-contacts'
2014-10-20  Junio C HamanoMerge branch 'jn/parse-config-slot'
2014-10-20  Junio C HamanoMerge branch 'rs/receive-pack-argv-leak-fix'
2014-10-20  Junio C HamanoMerge branch 'ta/config-set'
2014-10-20  Junio C HamanoMerge branch 'jk/test-shell-trace'
2014-10-20  Junio C HamanoMerge branch 'bc/asciidoc'
2014-10-14  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix'
2014-10-13  brian m. carlsonDocumentation: adjust document title underlining
2014-09-30  Junio C HamanoMerge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26  Junio C HamanoMerge branch 'sb/help-unknown-command-sort-fix'
2014-08-10  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-06-26  Junio C HamanoMerge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26  Junio C HamanoMerge git://repo.or.cz/git-gui
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14  Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2013-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui
2013-12-09  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-11-07  Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint
2013-11-04  Junio C HamanoMerge branch 'vd/doc-unpack-objects'
2013-10-30  Junio C HamanoMerge branch 'jk/refs-c-squelch-gcc'
2013-10-30  Junio C HamanoMerge branch 'jk/date-c-double-semicolon'
2013-10-14  Jonathan NiederMerge branch 'rj/highlight-test-hang'
2013-06-17  Junio C HamanoMerge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-03-28  Junio C HamanoMerge branch 'jc/remove-treesame-parent-in-simplify...
2013-02-04  Junio C HamanoMerge branch 'dl/am-hg-locale' into maint
2013-01-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-28  Junio C HamanoMerge branch 'dl/am-hg-locale'
2013-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-14  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-12  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc'
2013-01-10  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut' into...
next