rerere: add documentation for conflict normalization
[gitweb.git] / Documentation /
2018-05-30 Merge branch 'ma/regex-no-regfree-after-comp-fail'
2018-05-30 Merge branch 'ma/config-store-data-clear'
2018-05-30 Merge branch 'jk/snprintf-truncation'
2018-05-30 Merge branch 'jk/config-blob-sans-repo'
2018-05-30 Merge branch 'sb/submodule-merge-in-merge-recursive'
2018-05-30 Merge branch 'js/empty-config-section-fix'
2018-05-30 Merge branch 'bw/ref-prefix-for-configured-refspec'
2018-05-30 Merge branch 'sb/grep-die-on-unreadable-index'
2018-05-30 The seventh batch for 2.18
2018-05-30 Merge branch 'sb/submodule-update-try-harder'
2018-05-30 Merge branch 'lm/credential-netrc'
2018-05-30 Merge branch 'ab/get-short-oid'
2018-05-30 Merge branch 'jt/partial-clone-proto-v2'
2018-05-30 Merge branch 'bc/object-id'
2018-05-30 Merge branch 'sb/blame-color'
2018-05-30 Merge branch 'cf/submodule-progress-dissociate'
2018-05-30 Merge branch 'sg/complete-paths'
2018-05-30 Merge branch 'nd/travis-gcc-8'
2018-05-30 Merge branch 'nd/pack-struct-commit'
2018-05-30 Merge branch 'ma/create-pseudoref-with-null-old-oid'
2018-05-30 Merge branch 'jk/unavailable-can-be-missing'
2018-05-30 Merge branch 'bp/status-rename-config'
2018-05-30 Merge branch 'js/use-bug-macro'
2018-05-30 Merge branch 'rs/no-null-ptr-arith-in-fast-export'
2018-05-30 Merge branch 'nd/repo-clear-keep-the-index'
2018-05-30 Merge branch 'ma/lockfile-cleanup'
2018-05-30 Merge branch 'sg/t6500-no-redirect-of-stdin'
2018-05-30 Merge branch 'bp/merge-rename-config'
2018-05-30 Merge branch 'js/sequencer-and-root-commits'
2018-05-30 Merge branch 'dd/send-email-reedit'
2018-05-29 Sync with Git 2.17.1
2018-05-29 log-tree: allow to customize 'grafted' color
2018-05-29 help: add --config to list all available config
2018-05-29 Merge branch 'nd/command-list' into nd/complete-config...
2018-05-29 apply: add --intent-to-add
2018-05-29 tag: clarify in the doc that a tag can refer to a non...
2018-05-28 show-index: update documentation for index v2
2018-05-25 Use proper syntax for replaceables in command docs
2018-05-23 git-p4: add unshelve command
2018-05-23 The sixth batch for 2.18
2018-05-23 Merge branch 'fg/completion-external'
2018-05-23 Merge branch 'bc/asciidoctor-tab-width'
2018-05-23 Merge branch 'nd/pack-unreachable-objects-doc'
2018-05-23 Merge branch 'nd/completion-aliasfiletype-typofix'
2018-05-23 Merge branch 'em/status-rename-config'
2018-05-23 Merge branch 'cc/perf-bisect'
2018-05-23 Merge branch 'ah/misc-doc-updates'
2018-05-23 Merge branch 'bp/test-drop-caches'
2018-05-23 Merge branch 'en/unpack-trees-split-index-fix'
2018-05-23 Merge branch 'nd/doc-header'
2018-05-23 Merge branch 'bc/format-patch-cover-no-attach'
2018-05-23 Merge branch 'tb/test-apfs-utf8-normalization'
2018-05-23 Merge branch 'js/rebase-recreate-merge'
2018-05-23 Merge branch 'nd/pack-objects-pack-struct'
2018-05-23 Merge branch 'en/rename-directory-detection-reboot'
2018-05-23 Merge branch 'js/no-pager-shorthand'
2018-05-23 Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'
2018-05-23 Merge branch 'tg/worktree-add-existing-branch'
2018-05-23 Merge branch 'js/deprecate-grafts'
2018-05-23 Merge branch 'js/test-unset-prereq'
2018-05-23 Merge branch 'ab/perl-python-attrs'
2018-05-23 Merge branch 'sb/oid-object-info'
2018-05-23 Merge branch 'cc/perf-aggregate-unknown-option'
2018-05-23 Merge branch 'en/git-debugger'
2018-05-23 Merge branch 'bw/server-options'
2018-05-23 Merge branch 'nd/repack-keep-pack'
2018-05-23 Merge branch 'ds/lazy-load-trees'
2018-05-23 Merge branch 'nd/term-columns'
2018-05-23 Merge branch 'sg/t7005-spaces-in-filenames-cleanup'
2018-05-23 Merge branch 'sg/t5516-fixes'
2018-05-23 Merge branch 'sg/t5310-jgit-bitmap-test'
2018-05-23 Merge branch 'nd/pack-format-doc'
2018-05-23 Merge branch 'jk/apply-p-doc'
2018-05-23 Merge branch 'ao/config-api-doc'
2018-05-23 Merge branch 'bc/mailmap-self'
2018-05-23 Merge branch 'sb/object-store-replace'
2018-05-23 Merge branch 'hn/sort-ls-remote'
2018-05-22 Git 2.17.1 v2.17.1
2018-05-22 Merge branch 'jk/submodule-fsck-loose' into maint
2018-05-22 Sync with Git 2.16.4
2018-05-22 Git 2.16.4 v2.16.4
2018-05-22 Sync with Git 2.15.2
2018-05-22 Git 2.15.2 v2.15.2
2018-05-22 Sync with Git 2.14.4
2018-05-22 Git 2.14.4 v2.14.4
2018-05-22 Sync with Git 2.13.7
2018-05-22 Git 2.13.7 v2.13.7
2018-05-22 Merge branch 'jk/submodule-name-verify-fix' into jk...
2018-05-22 commit-graph.txt: update design document
2018-05-22 submodule: add --dissociate option to add/update commands
2018-05-22 submodule: add --progress option to add command
2018-05-21 completion: allow to customize the completable command...
2018-05-21 completion: add and use --list-cmds=alias
2018-05-21 completion: add and use --list-cmds=nohelpers
2018-05-21 help: use command-list.txt for the source of guides
2018-05-21 help: add "-a --verbose" to list all commands with...
2018-05-21 git: support --list-cmds=list-<category>
2018-05-21 completion: implement and use --list-cmds=main,others
2018-05-21 git.c: convert --list-* to --list-cmds=*
2018-05-13 add status config and command line options for rename...
next