l10n: es: 2.31.0 round 2
[git] / diff-merges.c
2021-03-01  Junio C HamanoMerge branch 'jh/untracked-cache-fix'
2021-03-01  Junio C HamanoMerge branch 'hv/trailer-formatting'
2021-03-01  Junio C HamanoMerge branch 'sv/t7001-modernize'
2021-03-01  Junio C HamanoMerge branch 'jt/transfer-fsck-across-packs'
2021-03-01  Junio C HamanoMerge branch 'ds/chunked-file-api'
2021-03-01  Junio C HamanoMerge branch 'jh/fsmonitor-prework'
2021-03-01  Junio C HamanoMerge https://github.com/prati0100/git-gui
2021-03-01  Junio C HamanoMerge branch 'js/commit-graph-warning'
2021-02-26  Junio C HamanoMerge branch 'jc/push-delete-nothing'
2021-02-26  Junio C HamanoMerge branch 'dl/doc-config-camelcase'
2021-02-26  Junio C HamanoMerge branch 'js/params-vs-args'
2021-02-26  Junio C HamanoMerge branch 'ug/doc-commit-approxidate'
2021-02-26  Junio C HamanoMerge branch 'ds/merge-base-independent'
2021-02-26  Junio C HamanoMerge branch 'ah/rebase-no-fork-point-config'
2021-02-26  Junio C HamanoMerge branch 'mt/grep-sparse-checkout'
2021-02-26  Junio C HamanoMerge branch 'cw/pack-config-doc'
2021-02-26  Junio C HamanoMerge branch 'jc/maint-column-doc-typofix'
2021-02-26  Junio C HamanoMerge branch 'mt/checkout-index-corner-cases'
2021-02-26  Junio C HamanoMerge branch 'js/doc-proto-v2-response-end'
2021-02-26  Junio C HamanoMerge branch 'rs/blame-optim'
2021-02-26  Junio C HamanoMerge branch 'mz/doc-notes-are-not-anchors'
2021-02-23  Junio C HamanoMerge branch 'ab/pager-exit-log'
2021-02-23  Junio C HamanoMerge branch 'ta/hash-function-transition-doc'
2021-02-23  Junio C HamanoMerge branch 'bc/signed-objects-with-both-hashes'
2021-02-18  Junio C HamanoMerge branch 'ak/config-bad-bool-error'
2021-02-18  Junio C HamanoMerge branch 'js/commit-graph-warning'
2021-02-18  Junio C HamanoMerge branch 'ew/rev-parse-since-test'
2021-02-18  Junio C HamanoMerge branch 'jx/t5411-unique-filenames'
2021-02-18  Junio C HamanoMerge branch 'js/fsck-name-objects-fix'
2021-02-18  Junio C HamanoMerge branch 'mt/grep-cached-untracked'
2021-02-18  Junio C HamanoMerge branch 'sh/mergetool-hideresolved'
2021-02-18  Junio C HamanoMerge branch 'jt/trace2-BUG'
2021-02-18  Junio C HamanoMerge branch 'js/range-diff-one-side-only'
2021-02-18  Junio C HamanoMerge branch 'js/range-diff-wo-dotdot'
2021-02-18  Junio C HamanoMerge branch 'jt/clone-unborn-head'
2021-02-18  Junio C HamanoMerge branch 'mr/bisect-in-c-4'
2021-02-18  Junio C HamanoMerge branch 'ds/commit-graph-genno-fix'
2021-02-18  Junio C HamanoMerge branch 'ak/corrected-commit-date'
2021-02-12  Junio C HamanoMerge branch 'tb/precompose-prefix-too'
2021-02-12  Junio C HamanoMerge branch 'jk/complete-branch-force-delete'
2021-02-12  Junio C HamanoMerge branch 'jv/upload-pack-filter-spec-quotefix'
2021-02-12  Junio C HamanoMerge branch 'tb/pack-revindex-on-disk'
2021-02-12  Junio C HamanoMerge branch 'ab/tests-various-fixup'
2021-02-11  Junio C HamanoSync with maint
2021-02-11  Junio C HamanoMerge branch 'en/merge-ort-perf'
2021-02-11  Junio C HamanoMerge branch 'en/ort-directory-rename'
2021-02-11  Junio C HamanoMerge branch 'tb/ci-run-cocci-with-18.04'
2021-02-10  Junio C HamanoMerge branch 'ab/detox-gettext-tests'
2021-02-10  Junio C HamanoMerge branch 'ab/grep-pcre-invalid-utf8'
2021-02-10  Junio C HamanoMerge branch 'ab/retire-pcre1'
2021-02-10  Junio C HamanoMerge branch 'jk/pretty-lazy-load-commit'
2021-02-10  Junio C HamanoMerge branch 'ds/more-index-cleanups'
2021-02-10  Junio C HamanoMerge branch 'rs/worktree-list-verbose'
2021-02-10  Junio C HamanoMerge branch 'js/rebase-i-commit-cleanup-fix'
2021-02-10  Junio C HamanoMerge branch 'jk/t0000-cleanups'
2021-02-10  Junio C HamanoMerge branch 'sg/t7800-difftool-robustify'
2021-02-10  Junio C HamanoMerge branch 'ab/lose-grep-debug'
2021-02-10  Junio C HamanoMerge branch 'jk/use-oid-pos'
2021-02-08  Junio C HamanoSync with 2.30.1
2021-02-06  Junio C HamanoSync with maint
2021-02-06  Junio C HamanoMerge branch 'sg/test-stress-jobs'
2021-02-06  Junio C HamanoMerge branch 'jk/weather-balloon-require-variadic-macro'
2021-02-06  Junio C HamanoMerge branch 'pb/ci-matrix-wo-shortcut'
2021-02-06  Junio C HamanoMerge branch 'pb/blame-funcname-range-userdiff'
2021-02-06  Junio C HamanoMerge branch 'jk/p5303-sed-portability-fix'
2021-02-06  Junio C HamanoMerge branch 'jv/pack-objects-narrower-ref-iteration'
2021-02-06  Junio C HamanoMerge branch 'ph/use-delete-refs'
2021-02-06  Junio C HamanoMerge branch 'tb/ls-refs-optim'
2021-02-06  Junio C HamanoMerge branch 'zh/ls-files-deduplicate'
2021-02-06  Junio C HamanoMerge branch 'ds/cache-tree-basics'
2021-02-06  Junio C HamanoMerge branch 'en/ort-conflict-handling'
2021-02-06  Junio C HamanoMerge branch 'so/log-diff-merge'
2020-12-21  Sergey Organovdiff-merges: add '--diff-merges=1' as synonym for ...
2020-12-21  Sergey Organovdiff-merges: add old mnemonic counterparts to --diff...
2020-12-21  Sergey Organovdiff-merges: let new options enable diff without -p
2020-12-21  Sergey Organovdiff-merges: do not imply -p for new options
2020-12-21  Sergey Organovdiff-merges: implement new values for --diff-merges
2020-12-21  Sergey Organovdiff-merges: make -m/-c/--cc explicitly mutually exclusive
2020-12-21  Sergey Organovdiff-merges: refactor opt settings into separate functions
2020-12-21  Sergey Organovdiff-merges: get rid of now empty diff_merges_init_revs()
2020-12-21  Sergey Organovdiff-merges: split 'ignore_merges' field
2020-12-21  Sergey Organovdiff-merges: fix -m to properly override -c/--cc
2020-12-21  Sergey Organovdiff-merges: revise revs->diff flag handling
2020-12-21  Sergey Organovdiff-merges: handle imply -p on -c/--cc logic for log.c
2020-12-21  Sergey Organovdiff-merges: introduce revs->first_parent_merges flag
2020-12-21  Sergey Organovdiff-merges: new function diff_merges_set_dense_combine...
2020-12-21  Sergey Organovdiff-merges: new function diff_merges_suppress()
2020-12-21  Sergey Organovdiff-merges: re-arrange functions to match the order...
2020-12-21  Sergey Organovdiff-merges: rename diff_merges_default_to_enable(...
2020-12-21  Sergey Organovdiff-merges: move checks for first_parent_only out...
2020-12-21  Sergey Organovdiff-merges: rename all functions to have common prefix
2020-12-21  Sergey Organovrevision: move diff merges functions to its own diff...