rerere: recalculate conflict ID when unresolved conflict is committed
[gitweb.git] / gpg-interface.c
2018-01-09 Merge branch 'js/test-with-ws-in-path'
2018-01-09 Merge branch 'sg/travis-skip-identical-test'
2018-01-09 Merge branch 'sg/travis-fixes'
2018-01-09 Merge branch 'js/misc-git-gui-stuff' of ../git-gui
2018-01-05 Merge branch 'jh/memihash-opt'
2017-12-28 Merge branch 'sr/http-sslverify-config-doc'
2017-12-28 Merge branch 'bp/fsmonitor'
2017-12-27 Merge branch 'sg/travis-fixes'
2017-12-27 Merge branch 'es/clone-shared-worktree'
2017-12-27 Merge branch 'jk/cvsimport-quoting'
2017-12-27 Merge branch 'rs/strbuf-read-once-reset-length'
2017-12-27 Merge branch 'rs/fmt-merge-msg-string-leak-fix'
2017-12-27 Merge branch 'rs/am-builtin-leakfix'
2017-12-27 Merge branch 'tb/check-crlf-for-safe-crlf'
2017-12-19 Merge branch 'sg/setup-doc-update'
2017-12-19 Merge branch 'bw/submodule-config-cleanup'
2017-12-19 Merge branch 'bw/pathspec-match-submodule-boundary'
2017-12-13 Merge branch 'jk/no-optional-locks'
2017-12-13 Merge branch 'ks/doc-checkout-previous'
2017-12-13 Merge branch 'jc/receive-pack-hook-doc'
2017-12-06 Merge branch 'sp/doc-info-attributes'
2017-12-06 Merge branch 'ph/stash-save-m-option-fix'
2017-12-06 Merge branch 'jk/fewer-pack-rescan'
2017-12-06 Merge branch 'rd/doc-notes-prune-fix'
2017-12-06 Merge branch 'rd/man-reflog-add-n'
2017-12-06 Merge branch 'rd/man-prune-progress'
2017-12-06 Merge branch 'tz/branch-doc-remove-set-upstream'
2017-12-06 Merge branch 'sb/submodule-recursive-checkout-detach...
2017-12-06 Merge branch 'jc/merge-base-fork-point-doc' into maint
2017-12-06 Merge branch 'tz/redirect-fix' into maint
2017-12-06 Merge branch 'tz/notes-error-to-stderr' into maint
2017-12-06 Merge branch 'rs/apply-inaccurate-eof-with-incomplete...
2017-12-06 Merge branch 'tz/complete-branch-copy' into maint
2017-12-06 Merge branch 'sd/branch-copy' into maint
2017-12-06 Merge branch 'sw/pull-ipv46-passthru' into maint
2017-12-06 Merge branch 'mh/avoid-rewriting-packed-refs' into...
2017-12-05 Merge branch 'ls/no-double-utf8-author-name' of .....
2017-11-28 Merge branch 'ma/branch-list-paginate'
2017-11-27 Merge branch 'sw/pull-ipv46-passthru'
2017-11-27 Merge branch 'ks/rebase-no-git-foo'
2017-11-27 Merge branch 'tz/complete-branch-copy'
2017-11-27 Merge branch 'rs/apply-inaccurate-eof-with-incomplete...
2017-11-27 Merge branch 'sd/branch-copy'
2017-11-27 Merge branch 'tz/notes-error-to-stderr'
2017-11-27 Merge branch 'tz/redirect-fix'
2017-11-27 Merge branch 'jc/merge-base-fork-point-doc'
2017-11-27 Merge branch 'jc/ignore-cr-at-eol'
2017-11-27 Merge branch 'rs/apply-fuzzy-match-fix' into maint
2017-11-27 Merge branch 'rs/imap-send-next-arg-fix' into maint
2017-11-22 Merge branch 'jn/reproducible-build' of ../git-gui...
2017-11-21 Merge branch 'rs/apply-fuzzy-match-fix'
2017-11-21 Merge branch 'av/fsmonitor'
2017-11-21 Merge branch 'bp/fsmonitor'
2017-11-21 Merge branch 'cb/t4201-robustify' into maint
2017-11-21 Merge branch 'ad/rebase-i-serie-typofix' into maint
2017-11-21 Merge branch 'jk/info-alternates-fix' into maint
2017-11-21 Merge branch 'ab/pcre-v2' into maint
2017-11-21 Merge branch 'bw/rebase-i-ignored-submodule-fix' into...
2017-11-15 Merge branch 'bp/read-index-from-skip-verification'
2017-11-15 Merge branch 'jk/info-alternates-fix'
2017-11-15 Merge branch 'cb/t4201-robustify'
2017-11-15 Merge branch 'ab/pcre-v2'
2017-11-15 Merge branch 'ad/rebase-i-serie-typofix'
2017-11-15 Merge branch 'bw/rebase-i-ignored-submodule-fix'
2017-11-15 Merge branch 'ao/merge-verbosity-getenv-just-once'
2017-11-15 Merge branch 'mh/avoid-rewriting-packed-refs'
2017-11-15 Merge branch 'rs/imap-send-next-arg-fix'
2017-11-15 Merge branch 'cn/diff-indent-no-longer-is-experimental...
2017-11-15 Merge branch 'js/mingw-full-version-in-resources' into...
2017-11-15 Merge branch 'dk/libsecret-unlock-to-load-fix' into...
2017-11-15 Merge branch 'js/early-config' into maint
2017-11-15 Merge branch 'ad/5580-unc-tests-on-cygwin' into maint
2017-11-15 Merge branch 'ao/diff-populate-filespec-lstat-errorpath...
2017-11-15 Merge branch 'sb/blame-config-doc' into maint
2017-11-15 Merge branch 'jc/check-ref-format-oor' into maint
2017-11-15 Merge branch 'jk/rebase-i-exec-gitdir-fix' into maint
2017-11-15 Merge branch 'bw/grep-recurse-submodules' into maint
2017-11-15 Merge branch 'js/submodule-in-excluded' into maint
2017-11-15 Merge branch 'ao/check-resolve-ref-unsafe-result' into...
2017-11-15 Merge branch 'kd/auto-col-with-pager-fix' into maint
2017-11-15 Merge branch 'sg/travis-fixes' into maint
2017-11-09 Merge branch 'js/mingw-full-version-in-resources'
2017-11-09 Merge branch 'dk/libsecret-unlock-to-load-fix'
2017-11-09 Merge branch 'js/early-config'
2017-11-09 Merge branch 'sg/travis-fixes'
2017-11-09 Merge branch 'ad/5580-unc-tests-on-cygwin'
2017-11-09 Merge branch 'ao/diff-populate-filespec-lstat-errorpath...
2017-11-09 Merge branch 'sb/blame-config-doc'
2017-11-09 Merge branch 'tz/fsf-address-update' of ../git-gui...
2017-11-06 Merge branch 'gc/gitweb-filetest-acl'
2017-11-06 Merge branch 'jc/check-ref-format-oor'
2017-11-06 Merge branch 'jk/revision-pruning-optim'
2017-11-06 Merge branch 'ds/find-unique-abbrev-optim'
2017-11-06 Merge branch 'ex/deprecate-empty-pathspec-as-match...
2017-11-06 Merge branch 'jk/rebase-i-exec-gitdir-fix'
2017-11-06 Merge branch 'cn/diff-indent-no-longer-is-experimental'
2017-11-06 Merge branch 'bw/grep-recurse-submodules'
2017-11-06 Merge branch 'js/submodule-in-excluded'
2017-11-06 Merge branch 'ao/check-resolve-ref-unsafe-result'
2017-11-06 Merge branch 'kd/auto-col-with-pager-fix'
next