summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams
2017-11-01diff: remove DIFF_OPT_TST macroBrandon Williams
2017-11-01diff: remove touched flagsBrandon Williams
2017-11-01diff: add flag to indicate textconv was set via cmdlineBrandon Williams
2017-11-01diff: convert flags to be stored in bitfieldsBrandon Williams
2017-10-31add, reset: use DIFF_OPT_SET macro to set a diff flagBrandon Williams
2017-10-28Hopefully final batch before 2.15Junio C Hamano
2017-10-28Merge branch 'sg/rev-list-doc-reorder-fix'Junio C Hamano
2017-10-28Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano
2017-10-28Merge branch 'ao/path-use-xmalloc'Junio C Hamano
2017-10-28Merge branch 'np/config-path-doc'Junio C Hamano
2017-10-27docs: fix formatting of rev-parse's --show-superproject-working-treeSebastian Schuberth
2017-10-27rev-list-options.txt: use correct directional referenceSZEDER Gábor
2017-10-26Merge branch 'mh/ref-locking-fix'Junio C Hamano
2017-10-25path.c: use xmalloc() in add_to_trie()Andrey Okoshkin
2017-10-25files_transaction_prepare(): fix handling of ref lock failureMichael Haggerty
2017-10-25t1404: add a bunch of tests of D/F conflictsMichael Haggerty
2017-10-24Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano
2017-10-24Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/gitJiang Xin
2017-10-24l10n: zh_CN: review for git v2.15.0 l10n round 2Ray Chen
2017-10-24l10n: zh_CN: for git v2.15.0 l10n round 2Jiang Xin
2017-10-24Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin
2017-10-23l10n: de.po: fix typosAndre Hinrichs
2017-10-23l10n: de.po: translate 70 new messagesRalf Thielow
2017-10-23Sync with 2.14.3Junio C Hamano
2017-10-23Git 2.14.3v2.14.3Junio C Hamano
2017-10-23Merge branch 'jk/info-alternates-fix' into maintJunio C Hamano
2017-10-23Merge branch 'jc/fetch-refspec-doc-update' into maintJunio C Hamano
2017-10-23Merge branch 'jk/write-in-full-fix' into maintJunio C Hamano
2017-10-23Merge branch 'rj/no-sign-compare' into maintJunio C Hamano
2017-10-23Merge branch 'ma/ts-cleanups' into maintJunio C Hamano
2017-10-23Merge branch 'ls/travis-scriptify' into maintJunio C Hamano
2017-10-23Merge branch 'er/fast-import-dump-refs-on-checkpoint' into maintJunio C Hamano
2017-10-23Merge branch 'jt/fast-export-copy-modify-fix' into maintJunio C Hamano
2017-10-23Merge branch 'nd/worktree-kill-parse-ref' into maintJunio C Hamano
2017-10-22l10n: ru.po: update Russian translationDimitriy Ryazantcev
2017-10-22Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin
2017-10-19Git 2.15-rc2v2.15.0-rc2Junio C Hamano
2017-10-19Merge branch 'jc/branch-force-doc-readability-fix'Junio C Hamano
2017-10-19Merge branch 'dg/filter-branch-filter-order-doc'Junio C Hamano
2017-10-19Merge branch 'jc/fetch-refspec-doc-update'Junio C Hamano
2017-10-19Merge branch 'wk/merge-options-gpg-sign-doc'Junio C Hamano
2017-10-19config doc: clarify "git config --path" exampleNathan Payre
2017-10-19Merge branch 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/gitJiang Xin
2017-10-19Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin
2017-10-19Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin
2017-10-19Merge branch 'translation' of https://github.com/ChrisADR/git-poJiang Xin
2017-10-19l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2Tran Ngoc Quan
2017-10-18l10n: sv.po: Update Swedish translation (3245t0f0u)Peter Krefting
2017-10-18l10n: fr.po: v2.15.0 round 2Jean-Noel Avila