Andrew's git - gitweb.git/history - Documentation/merge-options.txt

[gitweb.git] / Documentation / merge-options.txt

2017-11-13	Merge branch 'jm/status-ignored-files-list'	blob \| diff \| raw
2017-11-09	Merge branch 'js/mingw-redirect-std-handles'	blob \| diff \| raw
2017-11-09	Merge branch 'js/wincred-empty-cred'	blob \| diff \| raw
2017-11-09	Merge branch 'js/mingw-full-version-in-resources'	blob \| diff \| raw
2017-11-09	Merge branch 'dk/libsecret-unlock-to-load-fix'	blob \| diff \| raw
2017-11-09	Merge branch 'ks/mailmap'	blob \| diff \| raw
2017-11-09	Merge branch 'js/early-config'	blob \| diff \| raw
2017-11-09	Merge branch 'sg/travis-fixes'	blob \| diff \| raw
2017-11-09	Merge branch 'bw/diff-opt-impl-to-bitfields'	blob \| diff \| raw
2017-11-09	Merge branch 'rs/hex-to-bytes-cleanup'	blob \| diff \| raw
2017-11-09	Merge branch 'ad/5580-unc-tests-on-cygwin'	blob \| diff \| raw
2017-11-09	Merge branch 'ao/diff-populate-filespec-lstat-errorpath...	blob \| diff \| raw
2017-11-09	Merge branch 'sb/blame-config-doc'	blob \| diff \| raw
2017-11-09	Merge branch 'jm/relnotes-2.15-typofix'	blob \| diff \| raw
2017-11-06	Merge branch 'tg/deprecate-stash-save'	blob \| diff \| raw
2017-11-06	Merge branch 'tb/complete-checkout'	blob \| diff \| raw
2017-11-06	Merge branch 'gc/gitweb-filetest-acl'	blob \| diff \| raw
2017-11-06	Merge branch 'mp/push-pushoption-config'	blob \| diff \| raw
2017-11-06	Merge branch 'hv/fetch-moved-submodules-on-demand'	blob \| diff \| raw
2017-11-06	Merge branch 'jc/check-ref-format-oor'	blob \| diff \| raw
2017-11-06	Merge branch 'jc/t5601-copy-workaround'	blob \| diff \| raw
2017-11-06	Merge branch 'bc/object-id'	blob \| diff \| raw
2017-11-06	Merge branch 'jk/revision-pruning-optim'	blob \| diff \| raw
2017-11-06	Merge branch 'ds/find-unique-abbrev-optim'	blob \| diff \| raw
2017-11-06	Merge branch 'wk/pull-signoff'	blob \| diff \| raw
2017-11-06	Merge branch 'pc/submodule-helper'	blob \| diff \| raw \| diff to current
2017-11-06	Merge branch 'pb/bisect-helper'	blob \| diff \| raw \| diff to current
2017-11-06	Merge branch 'dm/run-command-ignored-hook-advise'	blob \| diff \| raw \| diff to current
2017-11-06	Merge branch 'ex/deprecate-empty-pathspec-as-match...	blob \| diff \| raw \| diff to current
2017-11-06	Merge branch 'jk/rebase-i-exec-gitdir-fix'	blob \| diff \| raw \| diff to current
2017-11-06	Merge branch 'cn/diff-indent-no-longer-is-experimental'	blob \| diff \| raw \| diff to current
2017-11-06	Merge branch 'bw/grep-recurse-submodules'	blob \| diff \| raw \| diff to current
2017-11-06	Merge branch 'js/submodule-in-excluded'	blob \| diff \| raw \| diff to current
2017-11-06	Merge branch 'ao/check-resolve-ref-unsafe-result'	blob \| diff \| raw \| diff to current
2017-11-06	Merge branch 'kd/auto-col-with-pager-fix'	blob \| diff \| raw \| diff to current
2017-11-06	Merge branch 'jc/no-cmd-as-subroutine'	blob \| diff \| raw \| diff to current
2017-11-06	Merge branch 'ma/lockfile-fixes'	blob \| diff \| raw \| diff to current
2017-10-30	Merge tag 'l10n-2.15.0-rnd2.1' of git://github.com...	blob \| diff \| raw \| diff to current
2017-10-28	Merge branch 'sg/rev-list-doc-reorder-fix'	blob \| diff \| raw \| diff to current
2017-10-28	Merge branch 'sb/rev-parse-show-superproject-root'	blob \| diff \| raw \| diff to current
2017-10-28	Merge branch 'ao/path-use-xmalloc'	blob \| diff \| raw \| diff to current
2017-10-28	Merge branch 'np/config-path-doc'	blob \| diff \| raw \| diff to current
2017-10-26	Merge branch 'mh/ref-locking-fix'	blob \| diff \| raw \| diff to current
2017-10-24	Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git...	blob \| diff \| raw \| diff to current
2017-10-23	Sync with 2.14.3	blob \| diff \| raw \| diff to current
2017-10-23	Merge branch 'jc/fetch-refspec-doc-update' into maint	blob \| diff \| raw \| diff to current
2017-10-19	Merge branch 'jc/branch-force-doc-readability-fix'	blob \| diff \| raw \| diff to current
2017-10-19	Merge branch 'dg/filter-branch-filter-order-doc'	blob \| diff \| raw \| diff to current
2017-10-19	Merge branch 'jc/fetch-refspec-doc-update'	blob \| diff \| raw \| diff to current
2017-10-19	Merge branch 'wk/merge-options-gpg-sign-doc'	blob \| diff \| raw \| diff to current
2017-10-18	Sync with maint	blob \| diff \| raw \| diff to current
2017-10-18	Merge branch 'jk/ref-filter-colors-fix'	blob \| diff \| raw \| diff to current
2017-10-18	Merge branch 'js/rebase-i-final'	blob \| diff \| raw \| diff to current
2017-10-17	Merge branch 'sb/diff-color-move'	blob \| diff \| raw \| diff to current
2017-10-17	Merge branch 'js/rebase-i-final'	blob \| diff \| raw \| diff to current
2017-10-17	Merge branch 'jc/doc-checkout'	blob \| diff \| raw \| diff to current
2017-10-13	pull: pass --signoff/--no-signoff to "git merge"	blob \| diff \| raw \| diff to current
2017-10-12	Documentation/merge-options.txt: describe -S/--gpg...	blob \| diff \| raw \| diff to current
2017-10-11	Merge branch 'ls/filter-process-delayed'	blob \| diff \| raw \| diff to current
2017-10-11	Merge branch 'tb/complete-describe'	blob \| diff \| raw \| diff to current
2017-10-11	Merge branch 'rs/rs-mailmap'	blob \| diff \| raw \| diff to current
2017-10-11	Merge branch 'rs/fsck-null-return-from-lookup'	blob \| diff \| raw \| diff to current
2017-10-11	Merge branch 'jk/sha1-loose-object-info-fix'	blob \| diff \| raw \| diff to current
2017-10-09	Merge branch 'js/rebase-i-final'	blob \| diff \| raw \| diff to current
2017-10-08	Merge branch 'maint' of git://github.com/git-l10n/git-po	blob \| diff \| raw \| diff to current
2017-10-07	Merge branch 'tb/ref-filter-empty-modifier'	blob \| diff \| raw \| diff to current
2017-10-07	Merge branch 'ks/verify-filename-non-option-error-messa...	blob \| diff \| raw \| diff to current
2017-10-07	Merge branch 'ks/branch-tweak-error-message-for-extra...	blob \| diff \| raw \| diff to current
2017-10-07	Merge branch 'ma/builtin-unleak'	blob \| diff \| raw \| diff to current
2017-10-07	Merge branch 'rb/compat-poll-fix'	blob \| diff \| raw \| diff to current
2017-10-07	Merge branch 'tg/memfixes'	blob \| diff \| raw \| diff to current
2017-10-07	Merge branch 'sb/branch-avoid-repeated-strbuf-release'	blob \| diff \| raw \| diff to current
2017-10-07	Merge branch 'rs/qsort-s'	blob \| diff \| raw \| diff to current
2017-10-07	Merge branch 'jn/strbuf-doc-re-reuse'	blob \| diff \| raw \| diff to current
2017-10-05	Merge branch 'ar/request-pull-phrasofix'	blob \| diff \| raw \| diff to current
2017-10-05	Merge branch 'rs/run-command-use-alloc-array'	blob \| diff \| raw \| diff to current
2017-10-05	Merge branch 'sb/git-clang-format'	blob \| diff \| raw \| diff to current
2017-10-05	Merge branch 'rs/tag-null-pointer-arith-fix'	blob \| diff \| raw \| diff to current
2017-10-05	Merge branch 'rs/cocci-de-paren-call-params'	blob \| diff \| raw \| diff to current
2017-10-05	Merge branch 'er/fast-import-dump-refs-on-checkpoint'	blob \| diff \| raw \| diff to current
2017-10-04	Merge branch 'jk/ui-color-always-to-auto-maint' into...	blob \| diff \| raw \| diff to current
2017-10-03	Merge branch 'bw/git-clang-format'	blob \| diff \| raw \| diff to current
2017-10-03	Merge branch 'ad/doc-markup-fix'	blob \| diff \| raw \| diff to current
2017-10-03	Merge branch 'mh/mmap-packed-refs'	blob \| diff \| raw \| diff to current
2017-10-03	Merge branch 'mr/doc-negative-pathspec'	blob \| diff \| raw \| diff to current
2017-10-03	Merge branch 'sb/diff-color-move'	blob \| diff \| raw \| diff to current
2017-10-03	Merge branch 'jk/validate-headref-fix'	blob \| diff \| raw \| diff to current
2017-10-03	Merge branch 'jk/no-optional-locks'	blob \| diff \| raw \| diff to current
2017-10-03	Merge branch 'sd/branch-copy'	blob \| diff \| raw \| diff to current
2017-10-03	Merge branch 'bc/rev-parse-parseopt-fix'	blob \| diff \| raw \| diff to current
2017-10-03	Merge branch 'js/rebase-i-final'	blob \| diff \| raw \| diff to current
2017-09-29	Merge branch 'ma/leakplugs'	blob \| diff \| raw \| diff to current
2017-09-29	Merge branch 'rj/no-sign-compare'	blob \| diff \| raw \| diff to current
2017-09-29	Merge branch 'sb/merge-commit-msg-hook'	blob \| diff \| raw \| diff to current
2017-09-29	Merge branch 'jt/fast-export-copy-modify-fix'	blob \| diff \| raw \| diff to current
2017-09-29	Merge branch 'jm/status-ignored-directory-optim'	blob \| diff \| raw \| diff to current
2017-09-28	Merge branch 'js/win32-lazyload-dll'	blob \| diff \| raw \| diff to current
2017-09-28	Merge branch 'jc/merge-x-theirs-docfix'	blob \| diff \| raw \| diff to current
2017-09-28	Merge branch 'ks/doc-use-camelcase-for-config-name'	blob \| diff \| raw \| diff to current
2017-09-28	Merge branch 'mk/diff-delta-avoid-large-offset'	blob \| diff \| raw \| diff to current
next