Documentation: git diff --check detects conflict markers
[gitweb.git] / commit.h
2016-03-17 Merge branch 'maint-2.5' into maint-2.6
2016-03-17 Merge branch 'maint-2.4' into maint-2.5
2016-01-04 Merge branch 'jk/pending-keep-tag-name' into maint
2016-01-04 Merge branch 'jk/symbolic-ref-maint' into maint
2016-01-04 Merge branch 'sg/completion-no-column' into maint
2015-12-15 Merge branch 'ls/p4-keep-empty-commits' into maint
2015-12-15 Merge branch 'jk/prune-mtime' into maint
2015-12-11 Merge branch 'sn/null-pointer-arith-in-mark-tree-uninte...
2015-12-11 Merge branch 'cb/t3404-shellquote' into maint
2015-12-11 Merge branch 'sb/doc-submodule-sync-recursive' into...
2015-12-11 Merge branch 'nd/doc-check-ref-format-typo' into maint
2015-12-11 Merge branch 'rs/show-branch-argv-array' into maint
2015-12-11 Merge branch 'rs/pop-commit' into maint
2015-12-11 Merge branch 'jk/test-lint-forbid-when-finished-in...
2015-12-08 Merge branch 'ad/sha1-update-chunked' into maint
2015-12-08 Merge branch 'jk/rebase-no-autostash' into maint
2015-12-04 Merge branch 'da/difftool' into maint
2015-12-04 Merge branch 'dk/gc-idx-wo-pack' into maint
2015-12-01 Merge branch 'pt/http-socks-proxy' into maint
2015-12-01 Merge branch 'rc/configure-use-libs-when-checking-a...
2015-11-05 Merge branch 'rs/daemon-plug-child-leak' into maint
2015-11-05 Merge branch 'rs/wt-status-detached-branch-fix' into...
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-05 Merge branch 'js/misc-fixes' into maint
2015-11-05 Merge branch 'jc/add-u-A-default-to-top' into maint
2015-11-05 Merge branch 'jk/delete-modechange-conflict' into maint
2015-11-05 Merge branch 'js/imap-send-curl-compilation-fix' into...
2015-11-05 Merge branch 'rp/link-curl-before-ssl' into maint
2015-11-05 Merge branch 'sa/send-email-smtp-batch-data-limit'...
2015-11-04 Merge branch 'xf/user-manual-ff' into maint
2015-11-04 Merge branch 'xf/user-manual-markup' into maint
2015-11-04 Merge branch 'jc/everyday-markup' into maint
2015-11-04 Merge branch 'jc/em-dash-in-doc' into maint
2015-11-04 Merge branch 'es/worktree-add' into maint
2015-11-03 Merge branch 'mk/blame-error-message' into maint
2015-11-03 Merge branch 'jk/merge-file-exit-code' into maint
2015-11-03 Merge branch 'dt/name-hash-dir-entry-fix' into maint
2015-11-03 Merge branch 'dt/t7063-fix-flaky-test' into maint
2015-11-03 Merge branch 'nd/gc-auto-background-fix' into maint
2015-11-03 Merge branch 'gr/rebase-i-drop-warn' into maint
2015-11-03 Merge branch 'js/clone-dissociate' into maint
2015-11-03 Merge branch 'jk/repository-extension' into maint
2015-10-20 Merge branch 'js/gc-with-stale-symref' into maint
2015-10-20 Merge branch 'jc/doc-gc-prune-now' into maint
2015-10-20 Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-16 Merge branch 'es/worktree-add-cleanup' into maint
2015-10-16 Merge branch 'tk/doc-interpret-trailers-grammo' into...
2015-10-16 Merge branch 'jk/asciidoctor-section-heading-markup...
2015-10-16 Merge branch 'nd/ls-remote-does-not-have-u-option'...
2015-10-16 Merge branch 'jc/fsck-dropped-errors' into maint
2015-10-16 Merge branch 'sb/http-flaky-test-fix' into maint
2015-10-16 Merge branch 'sb/perf-without-installed-git' into maint
2015-10-16 Merge branch 'js/icase-wt-detection' into maint
2015-10-16 Merge branch 'mm/detach-at-HEAD-reflog' into maint
2015-10-16 Merge branch 'gr/rebase-i-drop-warn' into maint
2015-10-16 Merge branch 'dt/log-follow-config' into maint
2015-10-16 Merge branch 'ti/glibc-stdio-mutex-from-signal-handler...
2015-10-16 Merge branch 'jk/notes-dwim-doc' into maint
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-16 Merge branch 'jw/make-arflags-customizable' into maint
2015-10-16 Merge branch 'jk/connect-clear-env' into maint
2015-10-16 Merge branch 'jk/blame-first-parent' into maint
2015-10-16 Merge branch 'mm/keyid-docs' into maint
2015-10-16 Merge branch 'pt/pull-builtin' into maint
2015-09-29 Sync with v2.5.4
2015-09-28 Sync with 2.4.10
2015-09-28 Sync with 2.3.10
2015-09-21 Merge branch 'bn/send-email-smtp-auth-error-message...
2015-09-17 Sync with 2.5.3
2015-09-17 Merge branch 'po/doc-branch-desc'
2015-09-17 Merge branch 'as/config-doc-markup-fix'
2015-09-17 Merge branch 'br/svn-doc-include-paths-config' into...
2015-09-17 Merge branch 'ah/submodule-typofix-in-error' into maint
2015-09-17 Merge branch 'js/maint-am-skip-performance-regression...
2015-09-14 Merge branch 'js/maint-am-skip-performance-regression'
2015-09-14 Merge branch 'ah/show-ref-usage-string'
2015-09-14 Merge branch 'sg/help-group'
2015-09-14 Merge git://ozlabs.org/~paulus/gitk
2015-09-14 Merge branch 'mp/t7060-diff-index-test'
2015-09-14 Merge branch 'gb/apply-comment-typofix'
2015-09-09 Sync with 2.5.2
2015-09-05 Merge branch 'master' of github.com:jiangxin/git into...
2015-09-04 Sync with maint
2015-09-04 Sync with 2.4.9
2015-09-04 Sync with 2.3.9
2015-09-04 Sync with 2.2.3
2015-09-04 Merge branch 'ee/clean-test-fixes' into maint
2015-09-04 Merge branch 'jk/log-missing-default-HEAD' into maint
2015-09-04 Merge branch 'cc/trailers-corner-case-fix' into maint
2015-09-04 Merge branch 'rs/archive-zip-many' into maint
2015-09-04 Merge branch 'jc/calloc-pathspec' into maint
2015-09-04 Merge branch 'sg/wt-status-header-inclusion' into maint
2015-09-04 Merge branch 'sg/t3020-typofix' into maint
2015-09-04 Merge branch 'as/docfix-reflog-expire-unreachable'...
2015-09-04 Merge branch 'jk/fix-alias-pager-config-key-warnings...
2015-09-04 Merge branch 'nd/dwim-wildcards-as-pathspecs' into...
2015-09-04 Merge branch 'sg/help-group' into maint
2015-09-04 Merge branch 'jh/strbuf-read-use-read-in-full' into...
2015-09-04 Merge branch 'cb/open-noatime-clear-errno' into maint
2015-09-04 Merge branch 'mh/get-remote-group-fix' into maint
next