rerere: add note about files with existing conflict markers
[gitweb.git] / Documentation /
2018-08-29 rerere: add note about files with existing conflict...
2018-08-29 rerere: mention caveat about unmatched conflict markers
2018-08-06 rerere: teach rerere to handle nested conflicts
2018-08-06 rerere: add documentation for conflict normalization
2018-06-28 Second batch for 2.19 cycle
2018-06-28 Merge branch 'sb/fix-fetching-moved-submodules'
2018-06-28 Merge branch 'tz/cred-netrc-cleanup'
2018-06-28 Merge branch 'jc/clean-after-sanity-tests'
2018-06-28 Merge branch 'nd/completion-negation'
2018-06-28 Merge branch 'pw/add-p-recount'
2018-06-28 Merge branch 'jk/fetch-all-peeled-fix'
2018-06-28 Merge branch 'ms/send-pack-honor-config'
2018-06-28 Merge branch 'jh/partial-clone'
2018-06-28 Merge branch 'sg/gpg-tests-fix'
2018-06-28 Merge branch 'as/safecrlf-quiet-fix'
2018-06-28 Merge branch 'ab/refspec-init-fix'
2018-06-25 First batch for 2.19 cycle
2018-06-25 Merge branch 'sb/plug-misc-leaks'
2018-06-25 Merge branch 'cc/tests-without-assuming-ref-files-backend'
2018-06-25 Merge branch 'sg/update-ref-stdin-cleanup'
2018-06-25 Merge branch 'nd/reject-empty-shallow-request'
2018-06-25 Merge branch 'ls/complete-remote-update-names'
2018-06-25 Merge branch 'ag/rebase-p'
2018-06-25 Merge branch 'nd/complete-config-vars'
2018-06-25 Merge branch 'sb/object-store-alloc'
2018-06-25 Merge branch 'jk/show-index'
2018-06-25 Merge branch 'en/merge-recursive-tests'
2018-06-25 Merge branch 'nd/diff-apply-ita'
2018-06-25 Merge branch 'ds/commit-graph-lockfile-fix'
2018-06-25 Merge branch 'nd/commit-util-to-slab'
2018-06-25 Merge branch 'pc/submodule-helper-foreach'
2018-06-25 Prepare to start 2.19 cycle
2018-06-19 Merge branch 'en/rename-directory-detection-reboot'
2018-06-19 Merge tag 'l10n-2.18.0-rnd3.1' of git://github.com...
2018-06-19 Merge branch 'cf/submodule-progress-dissociate'
2018-06-19 Merge branch 'js/rebase-i-root-fix'
2018-06-19 doc: fix typos in documentation and release notes
2018-06-18 Almost 2.18 final
2018-06-18 Merge branch 'es/make-no-iconv'
2018-06-18 Merge branch 'sg/t7406-chain-fix'
2018-06-18 Merge branch 'ks/branch-set-upstream'
2018-06-18 Merge branch 'js/rebase-i-root-fix'
2018-06-18 Merge branch 'jk/ewah-bounds-check'
2018-06-18 Merge tag 'l10n-2.18.0-rnd3' of git://github.com/git...
2018-06-18 A bunch of micro-fixes before going 2.18 final
2018-06-18 Merge branch 'sb/blame-color'
2018-06-18 Merge branch 'mw/doc-merge-enumfix'
2018-06-18 Merge branch 'en/rename-directory-detection'
2018-06-18 Merge branch 'rd/doc-remote-tracking-with-hyphen'
2018-06-18 Merge branch 'jl/zlib-restore-nul-termination'
2018-06-18 Merge branch 'ab/cred-netrc-no-autodie'
2018-06-18 Merge branch 'km/doc-workflows-typofix'
2018-06-18 Merge branch 'ld/git-p4-updates'
2018-06-18 Merge branch 'rd/diff-options-typofix'
2018-06-18 Merge branch 'rd/comment-typofix-in-sha1-file'
2018-06-18 RelNotes 2.18: minor fix to entry about dynamically...
2018-06-17 Merge branch 'master' of git://github.com/nafmo/git...
2018-06-16 Merge branch 'master' of git://github.com/git-l10n...
2018-06-14 doc: update the order of the syntax `git merge --continue`
2018-06-13 Git 2.18-rc2 v2.18.0-rc2
2018-06-13 Merge branch 'jk/index-pack-maint'
2018-06-13 Merge branch 'sg/completion-zsh-workaround'
2018-06-13 Merge branch 'sb/submodule-merge-in-merge-recursive'
2018-06-13 Merge branch 'jk/submodule-fsck-loose-fixup'
2018-06-13 RelNotes 2.18: clarify where directory rename detection...
2018-06-13 Use hyphenated "remote-tracking branch" (docs and comments)
2018-06-12 git-p4: add option to disable syncing of p4/master...
2018-06-12 git-p4: disable-rebase: allow setting this via configur...
2018-06-12 git-p4: add options --commit and --disable-rebase
2018-06-12 gitworkflows: fix grammar in 'Merge upwards' rule
2018-06-11 diff-options.txt: fix minor typos, font inconsistencies...
2018-06-11 RelNotes 2.18: typofixes
2018-06-08 Merge branch 'master' of git://github.com/git-l10n...
2018-06-04 Git 2.18-rc1 v2.18.0-rc1
2018-06-04 Merge branch 'bc/t3430-fixup'
2018-06-04 Merge branch 'bw/refspec-api'
2018-06-04 Merge branch 'tg/doc-sec-list'
2018-06-04 Merge branch 'rd/p4-doc-markup-env'
2018-06-04 Merge branch 'nd/remote-update-doc'
2018-06-04 Merge branch 'jt/submodule-pull-recurse-rebase'
2018-06-04 remote: doc typofix
2018-06-01 A bit more topics before -rc1
2018-06-01 Merge branch 'bw/ref-prefix-for-configured-refspec'
2018-06-01 Merge branch 'cc/tests-without-assuming-ref-files-backend'
2018-06-01 Merge branch 'rd/init-typo'
2018-06-01 Merge branch 'js/rebase-recreate-merge'
2018-06-01 Merge branch 'rd/tag-doc-lightweight'
2018-06-01 Merge branch 'rd/doc-options-placeholder'
2018-06-01 Merge branch 'en/rev-parse-invalid-range'
2018-06-01 Merge branch 'ld/p4-unshelve'
2018-06-01 Merge branch 'nd/use-opt-int-set-f'
2018-06-01 Merge branch 'pa/import-tars-long-names'
2018-06-01 Merge branch 'nd/command-list'
2018-06-01 p4.txt: Use backquotes for variable names
2018-06-01 remote.txt: update documentation for 'update' command
2018-06-01 RelNotes: remove duplicate release note
2018-06-01 note git-security@googlegroups.com in more places
2018-06-01 SubmittingPatches: replace numbered attributes with...
2018-05-31 Merge remote-tracking branch 'git-po/maint'
2018-05-30 Git 2.18-rc0 v2.18.0-rc0
next