summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-06-17Merge branch 'master' of git://github.com/alshopov/git-poLibravatar Jiang Xin1-19/+19
2018-06-17Merge branch 'fr_2.18_rnd3' of git://github.com/jnavila/gitLibravatar Jiang Xin1-466/+1071
2018-06-17l10n: bg.po: Updated Bulgarian translation (3608t)Libravatar Alexander Shopov1-19/+19
2018-06-17l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round 3Libravatar Tran Ngoc Quan1-21/+21
2018-06-16l10n: fr.po v2.18.0 round 3Libravatar Jean-Noël Avila1-466/+1071
2018-06-16l10n: es.po: Spanish update for v2.18.0 round 3Libravatar Christopher Diaz Riveros1-20/+20
2018-06-16l10n: git.pot: v2.18.0 round 3 (1 new, 1 removed)Libravatar Jiang Xin1-17/+17
2018-06-16Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Jiang Xin8-12862/+18214
2018-06-15Makefile: make NO_ICONV really mean "no iconv"Libravatar Eric Sunshine1-10/+12
2018-06-15tests: clean after SANITY testsLibravatar Junio C Hamano5-9/+6
2018-06-15log: prevent error if line range ends past end of fileLibravatar Isabella Stephens2-5/+4
2018-06-15blame: prevent error if range ends past end of fileLibravatar Isabella Stephens4-9/+13
2018-06-15fetch-pack: introduce negotiator APILibravatar Jonathan Tan7-167/+292
2018-06-15fetch-pack: move common check and marking togetherLibravatar Jonathan Tan1-2/+4
2018-06-15fetch-pack: make negotiation-related vars localLibravatar Jonathan Tan1-47/+69
2018-06-15fetch-pack: use ref adv. to prune "have" sentLibravatar Jonathan Tan2-3/+36
2018-06-15fetch-pack: directly end negotiation if ACK readyLibravatar Jonathan Tan1-4/+5
2018-06-15Merge branch 'master' of https://github.com/vnwildman/gitLibravatar Jiang Xin1-430/+994
2018-06-14submodule: unset core.worktree if no working tree is presentLibravatar Stefan Beller3-1/+18
2018-06-14t5526: test recursive submodules when fetching moved submodulesLibravatar Stefan Beller1-5/+1
2018-06-14submodule: fix NULL correctness in renamed broken submodulesLibravatar Stefan Beller1-2/+4
2018-06-14fetch-pack: clear marks before re-markingLibravatar Jonathan Tan1-3/+3
2018-06-14fetch-pack: split up everything_local()Libravatar Jonathan Tan1-9/+30
2018-06-14doc: update the order of the syntax `git merge --continue`Libravatar Meng-Sung Wu1-1/+1
2018-06-14blame: release string_list after use in parse_color_fields()Libravatar René Scharfe1-0/+1
2018-06-14merge-recursive: use xstrdup() instead of fixed bufferLibravatar René Scharfe1-5/+5
2018-06-14l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2Libravatar Tran Ngoc Quan1-430/+994
2018-06-13Git 2.18-rc2Libravatar Junio C Hamano2-1/+7
2018-06-13Merge branch 'jk/index-pack-maint'Libravatar Junio C Hamano4-2/+25
2018-06-13Merge branch 'sg/completion-zsh-workaround'Libravatar Junio C Hamano2-2/+5
2018-06-13Merge branch 'sb/submodule-merge-in-merge-recursive'Libravatar Junio C Hamano1-2/+2
2018-06-13Merge branch 'jk/submodule-fsck-loose-fixup'Libravatar Junio C Hamano2-8/+24
2018-06-13fetch-pack: test explicitly that --all can fetch tag references pointing to n...Libravatar Kirill Smelkov1-0/+31
2018-06-13packfile: correct zlib buffer handlingLibravatar Jeremy Linton1-0/+3
2018-06-13RelNotes 2.18: clarify where directory rename detection appliesLibravatar Elijah Newren1-1/+1
2018-06-13Use hyphenated "remote-tracking branch" (docs and comments)Libravatar Robert P. J. Day3-5/+5
2018-06-13git-credential-netrc: remove use of "autodie"Libravatar Ævar Arnfjörð Bjarmason1-1/+0
2018-06-12git-p4: auto-size the blockLibravatar Luke Diamand2-6/+29
2018-06-12git-p4: narrow the scope of exceptions caught when parsing an intLibravatar Luke Diamand1-1/+1
2018-06-12git-p4: raise exceptions from p4CmdList based on error from p4 serverLibravatar Luke Diamand1-4/+40
2018-06-12git-p4: better error reporting when p4 failsLibravatar Luke Diamand2-0/+133
2018-06-12git-p4: add option to disable syncing of p4/master with p4Libravatar Luke Diamand2-11/+28
2018-06-12git-p4: disable-rebase: allow setting this via configurationLibravatar Luke Diamand2-2/+5
2018-06-12git-p4: add options --commit and --disable-rebaseLibravatar Romain Merland3-6/+77
2018-06-12builtin/send-pack: populate the default configsLibravatar Masaya Suzuki1-1/+1
2018-06-12list-objects: check if filter is NULL before usingLibravatar Jonathan Tan2-0/+10
2018-06-12merge-recursive: add pointer about unduly complex looking codeLibravatar Elijah Newren1-0/+15
2018-06-12merge-recursive: rename conflict_rename_*() family of functionsLibravatar Elijah Newren1-43/+43
2018-06-12merge-recursive: clarify the rename_dir/RENAME_DIR meaningLibravatar Elijah Newren1-11/+17
2018-06-12merge-recursive: align labels with their respective code blocksLibravatar Elijah Newren1-3/+3