rerere: recalculate conflict ID when unresolved conflict is committed
[gitweb.git] / gpg-interface.c
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 Sync with Git 2.14.4
2018-05-22 Sync with Git 2.13.7
2018-05-22 Merge branch 'jk/submodule-name-verify-fix' into jk...
2018-05-08 Merge branch 'ma/http-walker-no-partial'
2018-05-08 Merge branch 'js/runtime-prefix'
2018-05-08 Merge branch 'js/colored-push-errors'
2018-05-08 Merge branch 'jc/parseopt-expiry-errors'
2018-05-08 Merge branch 'ma/fast-export-skip-merge-fix'
2018-05-08 Merge branch 'tz/doc-git-urls-reference'
2018-05-08 Merge branch 'tg/demote-stash-save-in-completion'
2018-05-08 Merge branch 'sa/send-email-dedup-some-headers'
2018-05-08 Merge branch 'nd/submodule-status-fix'
2018-05-08 Merge branch 'js/ident-date-fix'
2018-05-08 Merge branch 'bt/gpg-interface'
2018-05-08 Merge branch 'ab/git-svn-get-record-typofix'
2018-05-08 Merge branch 'sg/doc-gc-quote-mismatch-fix'
2018-04-25 Merge branch 'bp/fsmonitor-bufsize-fix'
2018-04-25 Merge branch 'es/fread-reads-dir-autoconf-fix'
2018-04-25 Merge branch 'js/t5404-path-fix'
2018-04-25 Merge branch 'mn/send-email-credential-doc'
2018-04-25 Merge branch 'ak/bisect-doc-typofix'
2018-04-25 Merge branch 'bw/commit-partial-from-subdirectory-fix'
2018-04-16 gpg-interface: find the last gpg signature line
2018-04-16 gpg-interface: extract gpg line matching helper
2018-04-16 gpg-interface: fix const-correctness of "eol" pointer
2018-04-16 gpg-interface: use size_t for signature buffer size
2018-04-16 gpg-interface: modernize function declarations
2018-04-16 gpg-interface: handle bool user.signingkey
2018-04-10 Merge branch 'ys/bisect-object-id-missing-conversion...
2018-04-10 Merge branch 'jk/diff-highlight-graph-fix'
2018-03-22 Merge branch 'sm/mv-dry-run-update' into maint
2018-03-22 Merge branch 'gs/test-unset-xdg-cache-home' into maint
2018-03-22 Merge branch 'sb/status-doc-fix' into maint
2018-03-22 Merge branch 'bp/fsmonitor' into maint
2018-03-22 Merge branch 'bc/doc-interpret-trailers-grammofix'...
2018-03-22 Merge branch 'sg/doc-test-must-fail-args' into maint
2018-03-22 Merge branch 'nd/ignore-glob-doc-update' into maint
2018-03-22 Merge branch 'tz/doc-show-defaults-to-head' into maint
2018-03-22 Merge branch 'jc/mailinfo-cleanup-fix' into maint
2018-03-22 Merge branch 'rb/hashmap-h-compilation-fix' into maint
2018-03-22 Merge branch 'cl/t9001-cleanup' into maint
2018-03-22 Merge branch 'jt/fsck-code-cleanup' into maint
2018-03-22 Merge branch 'nd/diff-flush-before-warning' into maint
2018-03-22 Merge branch 'sg/travis-build-during-script-phase'...
2018-03-21 Merge branch 'dp/merge-strategy-doc-fix'
2018-03-21 Merge branch 'ks/t3200-typofix'
2018-03-08 Merge branch 'mk/doc-pretty-fill'
2018-03-08 Merge branch 'ds/mark-parents-uninteresting-optim'
2018-03-08 Merge branch 'ds/find-unique-abbrev-optim'
2018-03-08 Merge branch 'sg/travis-build-during-script-phase'
2018-03-06 Merge branch 'xz/send-email-batch-size'
2018-03-06 Merge branch 'sm/mv-dry-run-update'
2018-03-06 Merge branch 'cb/ttk-style' of git-gui into cb/git...
2018-03-02 Merge branch 'bb/ssh-key-files' of git-gui into bb...
2018-03-02 Merge branch 'bp/bind-kp-enter' of git-gui into bp...
2018-02-28 Merge branch 'tz/do-not-clean-spec-file'
2018-02-28 Merge branch 'gs/test-unset-xdg-cache-home'
2018-02-28 Merge branch 'tk/apply-dev-null-verify-name-fix'
2018-02-28 Merge branch 'sb/status-doc-fix'
2018-02-27 Merge branch 'ys/bisect-object-id-missing-conversion...
2018-02-27 Merge branch 'nd/ita-wt-renames-in-status' into maint
2018-02-27 Merge branch 'jk/sq-dequote-on-bogus-input'
2018-02-27 Merge branch 'bp/fsmonitor'
2018-02-27 Merge branch 'bc/doc-interpret-trailers-grammofix'
2018-02-27 Merge branch 'sg/doc-test-must-fail-args'
2018-02-27 Merge branch 'rs/check-ignore-multi'
2018-02-27 Merge branch 'bp/name-hash-dirname-fix'
2018-02-15 Merge branch 'as/read-tree-prefix-doc-fix' into maint
2018-02-15 Merge branch 'jc/merge-symlink-ours-theirs' into maint
2018-02-15 Merge branch 'jm/svn-pushmergeinfo-fix' into maint
2018-02-15 Merge branch 'nd/ignore-glob-doc-update'
2018-02-15 Merge branch 'tg/reset-hard-show-head-with-pretty'
2018-02-15 Merge branch 'sb/pull-rebase-submodule'
2018-02-15 Merge branch 'jt/fsck-code-cleanup'
2018-02-13 Merge branch 'tz/doc-show-defaults-to-head'
2018-02-13 Merge branch 'jc/mailinfo-cleanup-fix'
2018-02-13 Merge branch 'rs/strbuf-cocci-workaround'
2018-02-13 Merge branch 'rb/hashmap-h-compilation-fix'
2018-02-13 Merge branch 'nd/diff-flush-before-warning'
2018-02-13 Merge branch 'cl/t9001-cleanup'
2018-01-23 Merge branch 'as/read-tree-prefix-doc-fix'
2018-01-23 Merge branch 'ys/bisect-object-id-missing-conversion...
2018-01-23 Merge branch 'jc/merge-symlink-ours-theirs'
2018-01-23 Merge branch 'jm/svn-pushmergeinfo-fix'
2018-01-23 Merge branch 'nd/ita-wt-renames-in-status'
2018-01-11 Merge branch 'js/test-with-ws-in-path'
2018-01-09 Merge branch 'jk/doc-diff-options'
2018-01-09 Merge branch 'sg/travis-check-untracked'
next